From 896d1f4345bd3cda9c7e5e30521857e65d30317b Mon Sep 17 00:00:00 2001 From: Cameron Date: Tue, 12 Jan 2016 17:11:06 -0800 Subject: [PATCH] Tinymce downgraded until styling corrected. Banner tweaks and deprecated config.php file added. --- e107_admin/admin.php | 3 ++- e107_plugins/banner/banner_menu.php | 2 ++ e107_plugins/tinymce4/e_footer.php | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/e107_admin/admin.php b/e107_admin/admin.php index 5cbf9a480..c37347af8 100644 --- a/e107_admin/admin.php +++ b/e107_admin/admin.php @@ -202,7 +202,8 @@ class admin_start e_LANGUAGEDIR."English/lan_parser_functions.php", e_HANDLER."np_class.php", e_CORE."shortcodes/single/user_extended.sc", - e_ADMIN."download.php" + e_ADMIN."download.php", + e_PLUGIN."banner/config.php" ); $found = array(); diff --git a/e107_plugins/banner/banner_menu.php b/e107_plugins/banner/banner_menu.php index 40834ed52..ce3fed5e2 100644 --- a/e107_plugins/banner/banner_menu.php +++ b/e107_plugins/banner/banner_menu.php @@ -106,6 +106,8 @@ if(!empty($menu_pref['banner_campaign']) && !empty($menu_pref['banner_amount'])) elseif(e_DEBUG == true) { echo "no banner data"; + print_a($menu_pref); + print_a($query); } $foot = e107::getParser()->parseTemplate($BANNER_MENU_END,true); diff --git a/e107_plugins/tinymce4/e_footer.php b/e107_plugins/tinymce4/e_footer.php index bd85e5e3b..f1edd22b1 100644 --- a/e107_plugins/tinymce4/e_footer.php +++ b/e107_plugins/tinymce4/e_footer.php @@ -17,8 +17,8 @@ if((e107::wysiwyg() === true && check_class($pref['post_html'])) || strpos(e_SEL { if(e_PAGE != 'image.php') { - // e107::js('footer', "https://tinymce.cachefly.net/4.2/tinymce.min.js"); - e107::js('footer', "//cdn.tinymce.com/4/tinymce.min.js"); + e107::js('footer', "https://tinymce.cachefly.net/4.2/tinymce.min.js"); + // e107::js('footer', "//cdn.tinymce.com/4/tinymce.min.js"); e107::js('footer',e_PLUGIN.'tinymce4/wysiwyg.php','jquery',5); // Add to e107_config.php to view hidden content when TinyMce not saving correctly