From 2a842bd3f4b1b26a05877361c02fdcc4f78aba0e Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Mon, 6 Aug 2018 14:11:28 -0700
Subject: [PATCH] Media-picker BC fixes.

---
 e107_admin/image.php          | 6 ++++--
 e107_handlers/media_class.php | 9 +++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/e107_admin/image.php b/e107_admin/image.php
index 194e93b5b..2d0f871a6 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -1761,8 +1761,10 @@ class media_admin_ui extends e_admin_ui
 		$search		= !empty($option['search']) ? $option['search'] : null;
 
 
-		$cat 	= ($category) ? $category."+" : ""; // the '+' loads category '_common' as well as the chosen category.
-		$images = e107::getMedia()->getImages($cat,$frm,$limit,$search);
+	//	$cat 	= ($category) ? $category."+" : "";
+		$images = e107::getMedia()->getImages($category,$frm,$limit,$search);
+
+
 
 		foreach($images as $val)
 		{
diff --git a/e107_handlers/media_class.php b/e107_handlers/media_class.php
index 417304c5b..0a00b758e 100644
--- a/e107_handlers/media_class.php
+++ b/e107_handlers/media_class.php
@@ -494,7 +494,12 @@ class e_media
 			}
 			else
 			{
-				$catArray[] = $cat; 
+				$catArray[] = $cat;
+
+				if($type === 'image')
+				{
+					$catArray[] = $cat.'_image'; // BC Fix. 
+				}
 			}
 		}
 
@@ -1155,7 +1160,7 @@ class e_media
 
 				*/
 
-				$preview = $tp->toImage($default, array('w'=>$width, 'h'=>$height, 'class'=>'image-selector img-responsive img-fluid'));
+				$preview = $tp->toImage($default, array('w'=>$width, 'h'=>$height, 'class'=>'image-selector img-responsive img-fluid', 'legacy'=>varset($options['legacyPath'])));
 			//	$previewURL = $tp->thumbUrl($default, array('w'=>800));