From 3a4af5371f07090406988f83b594f191bd8f51ef Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Fri, 11 Mar 2016 17:38:46 -0800
Subject: [PATCH] Disable auto-linking in TinyMce as e107 will do it (if
 enabled)

---
 e107_plugins/tinymce4/templates/admin.xml     | 2 +-
 e107_plugins/tinymce4/templates/mainadmin.xml | 8 ++++++--
 e107_plugins/tinymce4/templates/member.xml    | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/e107_plugins/tinymce4/templates/admin.xml b/e107_plugins/tinymce4/templates/admin.xml
index 43cffeb36..a4f29f2a0 100644
--- a/e107_plugins/tinymce4/templates/admin.xml
+++ b/e107_plugins/tinymce4/templates/admin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <tinymce name="Administrators" version="4">
-    <plugins>advlist autolink lists link image charmap print preview hr anchor pagebreak searchreplace wordcount visualblocks visualchars code fullscreen
+    <plugins>advlist lists link image charmap print preview hr anchor pagebreak searchreplace wordcount visualblocks visualchars code fullscreen
         insertdatetime media nonbreaking save table contextmenu directionality emoticons template paste textcolor emoticons </plugins>
     <menubar>edit view format insert table tools</menubar>
     <toolbar1>undo redo | removeformat | styleselect | bold italic underline forecolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image  template | e107-image e107-video fontawesome smileys | preview | fullscreen</toolbar1>
diff --git a/e107_plugins/tinymce4/templates/mainadmin.xml b/e107_plugins/tinymce4/templates/mainadmin.xml
index abe454072..433860c3a 100644
--- a/e107_plugins/tinymce4/templates/mainadmin.xml
+++ b/e107_plugins/tinymce4/templates/mainadmin.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0"?>
 <tinymce name="Main Admin" version="4">
-	<plugins>advlist autolink autosave lists link image charmap print preview hr anchor pagebreak searchreplace wordcount visualchars code fullscreen
+	<plugins>advlist autosave lists link image charmap print preview hr anchor pagebreak searchreplace wordcount visualchars code fullscreen
         insertdatetime media nonbreaking table contextmenu directionality emoticons template paste textcolor </plugins>
 	<menubar>edit view format insert table tools</menubar>
-	<toolbar1>undo redo | removeformat | styleselect | bold italic underline forecolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image  template | e107-image e107-video e107-glyph smileys | preview | fullscreen</toolbar1>
+	<toolbar1>undo redo | removeformat | styleselect | bold italic underline forecolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image  template | e107-image media e107-video e107-glyph smileys | preview | fullscreen</toolbar1>
 	<external_plugins>e107</external_plugins>
 	<image_advtab>true</image_advtab>
+	<media_alt_source>false</media_alt_source>
+	<media_dimensions>false</media_dimensions>
+	<media_poster>false</media_poster>
+	<media_filter_html>false</media_filter_html>
 	<extended_valid_elements>i[*], object[*],embed[*],bbcode[*]</extended_valid_elements>
 	<templates>[
         {
diff --git a/e107_plugins/tinymce4/templates/member.xml b/e107_plugins/tinymce4/templates/member.xml
index c449a5999..62c25c80c 100644
--- a/e107_plugins/tinymce4/templates/member.xml
+++ b/e107_plugins/tinymce4/templates/member.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <tinymce name="Main Admin" version="4">
-	<plugins>advlist autolink autosave lists link image charmap print preview hr anchor pagebreak searchreplace wordcount visualchars fullscreen
+	<plugins>advlist autosave lists link image charmap print preview hr anchor pagebreak searchreplace wordcount visualchars fullscreen
         insertdatetime media nonbreaking table contextmenu directionality emoticons template paste textcolor </plugins>
 	<menubar>edit view insert table tools</menubar>
 	<toolbar1>undo redo | removeformat | styleselect | bold italic underline forecolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image  template | smileys | preview</toolbar1>