diff --git a/class2.php b/class2.php index f57a6ffb7..ba70c72c8 100644 --- a/class2.php +++ b/class2.php @@ -690,7 +690,11 @@ if(isset($pref['lan_global_list'])) { foreach($pref['lan_global_list'] as $path) { - e107::plugLan($path,'global',true); + if(e107::plugLan($path, 'global', true) === false) + { + e107::plugLan($path, 'global', false); + } + } } diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index 5e37592b4..61dc1b2e9 100644 --- a/e107_handlers/e107_class.php +++ b/e107_handlers/e107_class.php @@ -3103,7 +3103,7 @@ class e107 * * @param string $fname filename without the extension part (e.g. 'comment') * @param boolean $admin true if it's an administration language file - * @return void + * @return bool */ public static function coreLan($fname, $admin = false) { @@ -3114,7 +3114,8 @@ class e107 $path = e_LANGUAGEDIR.e_LANGUAGE.'/'.$fname; self::setRegistry($cstring, true); - self::includeLan($path, false); + + return self::includeLan($path, false); } /** @@ -3143,7 +3144,7 @@ class e107 * @param string $plugin plugin name * @param string $fname filename without the extension part (e.g. 'common') * @param boolean $flat false (default, preferred) Language folder structure; true - prepend Language to file name - * @return void + * @return bool */ public static function plugLan($plugin, $fname = '', $flat = false) { @@ -3152,8 +3153,11 @@ class e107 $plugin = preg_replace('/[^\w]/', '', $plugin); - - if($fname && is_string($fname)) + if($fname === 'global') // fix ambiguity + { + $fname = e_LANGUAGE."_global"; + } + elseif($fname && is_string($fname)) { $fname = e_LANGUAGE.($flat ? '_' : '/').preg_replace('#[^\w/]#', '', trim($fname, '/')); } @@ -3184,7 +3188,8 @@ class e107 self::setRegistry($cstring, true); - self::includeLan($path, false); + + return self::includeLan($path, false); } /** @@ -3212,7 +3217,7 @@ class e107 * @param string $fname filename without the extension part (e.g. 'common' for common.php) * @param string $theme theme name, if null current theme will be used * @param boolean $flat false (default, preferred) Language folder structure; true - prepend Language to file name - * @return void + * @return bool */ public static function themeLan($fname = '', $theme = null, $flat = false) { @@ -3233,7 +3238,8 @@ class e107 } self::setRegistry($cstring, true); - self::includeLan($path, false); + + return self::includeLan($path, false); } diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php index bc9d81dee..88a0eade2 100644 --- a/e107_handlers/plugin_class.php +++ b/e107_handlers/plugin_class.php @@ -4769,8 +4769,9 @@ class e107plugin if(E107_DEBUG_LEVEL > 0) { - $dbgArr = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS,2); - e107::getDebug()->log("Legacy Plugin Parse (xml): ".$plugName. print_a($dbgArr[1],true)); + $dbgArr = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS,3); + unset($dbgArr[0]); + e107::getDebug()->log("Legacy Plugin Parse (xml): ".$plugName. print_a($dbgArr,true)); } // $xml->setOptArrayTags('extendedField,userclass,menuLink,commentID'); // always arrays for these tags. diff --git a/e107_plugins/list_new/admin_list_config.php b/e107_plugins/list_new/admin_list_config.php index d98aaa4e1..a2db56c79 100644 --- a/e107_plugins/list_new/admin_list_config.php +++ b/e107_plugins/list_new/admin_list_config.php @@ -62,7 +62,7 @@ if(isset($message)) //display admin page $text = $rc->admin->display(); -e107::getRender()->tablerender(LAN_PLUGIN_LISTNEW_NAME, $mes->render(). $text); +e107::getRender()->tablerender(LAN_PLUGIN_LIST_NEW_NAME, $mes->render(). $text); /** * Display admin menu diff --git a/e107_plugins/list_new/languages/English_global.php b/e107_plugins/list_new/languages/English_global.php index f09c85991..e797dc7c6 100644 --- a/e107_plugins/list_new/languages/English_global.php +++ b/e107_plugins/list_new/languages/English_global.php @@ -5,6 +5,6 @@ * * 'List new items' global language defines */ -define("LAN_PLUGIN_LISTNEW_NAME", "List New Items"); -define("LAN_PLUGIN_LISTNEW_DESCRIPTION", "This plugin allows you to view a list and/or menu of recent additions in all e107 categories. You can either view the list with data since your last visit, or view a general latest additions list."); -?> \ No newline at end of file + +define("LAN_PLUGIN_LIST_NEW_NAME", "List New Items"); +define("LAN_PLUGIN_LIST_NEW_DESCRIPTION", "This plugin allows you to view a list and/or menu of recent additions in all e107 categories. You can either view the list with data since your last visit, or view a general latest additions list."); diff --git a/e107_plugins/list_new/plugin.xml b/e107_plugins/list_new/plugin.xml index 2cf4a2671..c76bf13ae 100644 --- a/e107_plugins/list_new/plugin.xml +++ b/e107_plugins/list_new/plugin.xml @@ -1,14 +1,14 @@ - + - This plugin allows you to view a list and/or menu of recent additions in all e107 categories. You can either view the list with data since your last visit, or view a general latest additions list. + This plugin allows you to view a list and/or menu of recent additions in all e107 categories. You can either view the list with data since your last visit, or view a general latest additions list. content Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt) LIST_PLUGIN_3 - LAN_PLUGIN_LISTNEW_NAME + LAN_PLUGIN_LIST_NEW_NAME diff --git a/e107_themes/bootstrap3/css/bootstrap-dark.min.css b/e107_themes/bootstrap3/css/bootstrap-dark.min.css index eaf68f749..bc46f60ba 100644 --- a/e107_themes/bootstrap3/css/bootstrap-dark.min.css +++ b/e107_themes/bootstrap3/css/bootstrap-dark.min.css @@ -396,7 +396,7 @@ code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace} code{color:#c7254e;background-color:#f9f2f4;border-radius:4px} kbd{color:#fff;background-color:#333;border-radius:3px;box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)} kbd kbd{padding:0;font-size:100%;box-shadow:none} -pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;word-break:break-all;word-wrap:break-word;color:#999;background-color:#f5f5f5;border:1px solid inherit;border-radius:4px} +pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid inherit;border-radius:4px} .container,.container-fluid{margin-right:auto;margin-left:auto} pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0} .container,.container-fluid{padding-left:15px;padding-right:15px} @@ -1495,7 +1495,7 @@ optgroup{background-color:#494949} .alert .alert-link,.alert a{color:#fff;text-decoration:underline} .alert .close,.alert a.btn{text-decoration:none} .alert .close{color:#000} -.alert pre{background-color:rgba(0,0,0,.4);margin-top:10px;color:#fff} +pre{background-color:rgba(0,0,0,.4);margin-top:10px;color:#fff} a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#0f0f0f} .jumbotron{border:1px solid rgba(0,0,0,.6)} .panel-danger .panel-heading,.panel-info .panel-heading,.panel-primary .panel-heading,.panel-success .panel-heading,.panel-warning .panel-heading{border-color:#000}