diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php index 813bf2747..bd2609110 100644 --- a/e107_core/shortcodes/batch/admin_shortcodes.php +++ b/e107_core/shortcodes/batch/admin_shortcodes.php @@ -973,7 +973,7 @@ class admin_shortcodes { return false; } - + global $pref; if (ADMIN && ADMINPERMS == '0') diff --git a/e107_core/shortcodes/single/menu.php b/e107_core/shortcodes/single/menu.php index f4505dd59..948e5f186 100644 --- a/e107_core/shortcodes/single/menu.php +++ b/e107_core/shortcodes/single/menu.php @@ -16,7 +16,7 @@ function menu_shortcode($parm, $mode='') } unset($parm['path']); - return e107::getMenu()->renderMenu($plugin,$menu."_menu", http_build_query($parm, '', '&')); + return e107::getMenu()->renderMenu($plugin,$menu."_menu", http_build_query($parm, '', '&'),true); } else @@ -37,7 +37,7 @@ function menu_shortcode($parm, $mode='') $menu = $plugin; } - return e107::getMenu()->renderMenu($plugin,$menu."_menu"); + return e107::getMenu()->renderMenu($plugin,$menu."_menu", null, true); } } } diff --git a/e107_plugins/tinymce4/e_footer.php b/e107_plugins/tinymce4/e_footer.php index a2509fb85..37b119a61 100644 --- a/e107_plugins/tinymce4/e_footer.php +++ b/e107_plugins/tinymce4/e_footer.php @@ -19,7 +19,9 @@ if((e107::wysiwyg() === true && check_class($pref['post_html'])) || strpos(e_SEL { // e107::js('footer', "https://tinymce.cachefly.net/4.3/tinymce.min.js"); - e107::js('footer', '//cdn.tinymce.com/4/tinymce.min.js'); + // e107::js('footer', '//cdn.tinymce.com/4/tinymce.min.js'); + + e107::js('footer', 'https://cdnjs.cloudflare.com/ajax/libs/tinymce/4.5.3/tinymce.min.js'); // e107::js('footer', "//cdn.tinymce.com/4/tinymce.min.js");