mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

Tinymce downgraded until styling corrected. Banner tweaks and deprecated config.php file added.

Browse Source
This commit is contained in:
Cameron
2016-01-12 17:11:06 -08:00
parent d0fccd540f
commit 896d1f4345
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
e107_admin/admin.php
View File

@@ -202,7 +202,8 @@ class admin_start
e_LANGUAGEDIR."English/lan_parser_functions.php", e_LANGUAGEDIR."English/lan_parser_functions.php",
e_HANDLER."np_class.php", e_HANDLER."np_class.php",
e_CORE."shortcodes/single/user_extended.sc", e_CORE."shortcodes/single/user_extended.sc",
e_ADMIN."download.php" e_ADMIN."download.php",
e_PLUGIN."banner/config.php"
); );
$found = array(); $found = array();

2
e107_plugins/banner/banner_menu.php
View File

@@ -106,6 +106,8 @@ if(!empty($menu_pref['banner_campaign']) && !empty($menu_pref['banner_amount']))
elseif(e_DEBUG == true) elseif(e_DEBUG == true)
{ {
echo "no banner data"; echo "no banner data";
print_a($menu_pref);
print_a($query);
} }
$foot = e107::getParser()->parseTemplate($BANNER_MENU_END,true); $foot = e107::getParser()->parseTemplate($BANNER_MENU_END,true);

4
e107_plugins/tinymce4/e_footer.php
View File

@@ -17,8 +17,8 @@ if((e107::wysiwyg() === true && check_class($pref['post_html'])) || strpos(e_SEL
{ {
if(e_PAGE != 'image.php') if(e_PAGE != 'image.php')
{ {
// e107::js('footer', "https://tinymce.cachefly.net/4.2/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', "//cdn.tinymce.com/4/tinymce.min.js");
e107::js('footer',e_PLUGIN.'tinymce4/wysiwyg.php','jquery',5); e107::js('footer',e_PLUGIN.'tinymce4/wysiwyg.php','jquery',5);
// Add to e107_config.php to view hidden content when TinyMce not saving correctly // Add to e107_config.php to view hidden content when TinyMce not saving correctly