diff --git a/e107_admin/header.php b/e107_admin/header.php index 601603e27..873da70bf 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -336,12 +336,22 @@ $jslib->renderHeader('admin', false); e107::getJs()->renderJs('header', 2); e107::getJs()->renderJs('header_inline', 2); -//DEPRECATED - use e107::getJs()->headerFile('{e_PLUGIN}myplug/js/my.js', $zone = 2) -if (isset($eplug_js) && $eplug_js) +/* @deprecated -use e107::js('myplug','js/my.js') instead; */ +if (!empty($eplug_js)) { - e107::getMessage()->addDebug('Deprecated $eplug_js method detected. Use e107::js() function inside an e_header.php file instead.'.print_a($eplug_js,true)); + e107::getMessage()->addDebug('Deprecated $eplug_js method detected. Use e107::js() function inside an e_header.php file instead.'.print_a($eplug_js,true)); echo "\n\n"; - echo "\n"; + + if(!is_array($eplug_js)) + { + $eplug_js = array($eplug_js); + } + + foreach($eplug_js as $vjss) + { + echo "\n"; + } + } //FIXME - theme.js/user.js should be registered/rendered through e_jsmanager diff --git a/e107_plugins/comment_menu/comment_menu_template.php b/e107_plugins/comment_menu/comment_menu_template.php index 0bc25a435..6ee1d84a9 100644 --- a/e107_plugins/comment_menu/comment_menu_template.php +++ b/e107_plugins/comment_menu/comment_menu_template.php @@ -35,7 +35,7 @@ if (!isset($COMMENT_MENU_TEMPLATE)) $COMMENT_MENU_TEMPLATE['item'] = "