|
@@ -308,7 +308,7 @@ discard block |
|
|
block discarded – undo |
|
308
|
308
|
* @param string $appLang the application language, only if type = "language" |
|
309
|
309
|
* @return string|null the full file path |
|
310
|
310
|
*/ |
|
311
|
|
- protected function getDefaultFilePathForFunctionLanguage($file, $type, $appLang = null){ |
|
|
311
|
+ protected function getDefaultFilePathForFunctionLanguage($file, $type, $appLang = null) { |
|
312
|
312
|
$searchDir = null; |
|
313
|
313
|
if ($type == 'function') { |
|
314
|
314
|
$searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH); |
|
@@ -334,7 +334,7 @@ discard block |
|
|
block discarded – undo |
|
334
|
334
|
* @param string|null $module the module if is not null will return it |
|
335
|
335
|
* @return string|null |
|
336
|
336
|
*/ |
|
337
|
|
- protected function getModuleFromSuperController($module){ |
|
|
337
|
+ protected function getModuleFromSuperController($module) { |
|
338
|
338
|
$obj = & get_instance(); |
|
339
|
339
|
if (!$module && !empty($obj->moduleName)) { |
|
340
|
340
|
$module = $obj->moduleName; |
Please login to merge, or discard this patch.