From 775cf26b987c9b19f59b221a993836c4a4040522 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Mon, 10 Sep 2018 12:31:31 -0700
Subject: [PATCH] Media Manager Issue #3426

---
 e107_plugins/tinymce4/plugins/e107/mediamanager.php |  5 +++++
 e107_web/js/plupload/upload.php                     | 11 ++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/e107_plugins/tinymce4/plugins/e107/mediamanager.php b/e107_plugins/tinymce4/plugins/e107/mediamanager.php
index ed3e75673..65d68ae82 100644
--- a/e107_plugins/tinymce4/plugins/e107/mediamanager.php
+++ b/e107_plugins/tinymce4/plugins/e107/mediamanager.php
@@ -6,6 +6,11 @@ $types = array('img','video','glyph');
 
 $bbcode = in_array(e_QUERY,$types) ? e_QUERY : 'img';
 
+if($bbcode === 'video')
+{
+	$bbcode .= '&youtube=1';
+}
+
 header("Location: ".e_ADMIN_ABS.'image.php?mode=main&action=dialog&for='.$_SESSION['media_category'].'&tagid=&iframe=1&bbcode='.$bbcode, true);
 exit; 
 
diff --git a/e107_web/js/plupload/upload.php b/e107_web/js/plupload/upload.php
index d6b65fcb9..0c6dadd5d 100644
--- a/e107_web/js/plupload/upload.php
+++ b/e107_web/js/plupload/upload.php
@@ -232,14 +232,15 @@
 		}
 
 	}
+	
 
-
-
-
-	if($_GET['for'] != '') // leave in upload directory if no category given.
+	if(!empty($_GET['for'])) // leave in upload directory if no category given.
 	{
 		$uploadPath = varset($_GET['path'],null);
-		$result = e107::getMedia()->importFile($fileName, $_GET['for'], array('path'=>$uploadPath));
+		$for = $tp->filter($_GET['for']);
+		$for = str_replace(array('+','^'),'', $for);
+
+		$result = e107::getMedia()->importFile($fileName, $for, array('path'=>$uploadPath));
 	}