From 11d96891523f5a5df30b55b9142c5754672f8ab5 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Mon, 6 Feb 2017 19:31:33 -0800
Subject: [PATCH] Changed TinyMce CDN to Cloudflare Corrected issue with {MENU}
 when used to load plugin menus.

---
 e107_core/shortcodes/batch/admin_shortcodes.php | 2 +-
 e107_core/shortcodes/single/menu.php            | 4 ++--
 e107_plugins/tinymce4/e_footer.php              | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

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");