From c9b1d0f1a92fe726f7f1f054b913a7e5449e2ecf Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Wed, 9 Oct 2013 15:48:19 -0700
Subject: [PATCH] Gallery slider category fix

---
 e107_handlers/media_class.php        | 9 ++++++++-
 e107_plugins/gallery/e_shortcode.php | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/e107_handlers/media_class.php b/e107_handlers/media_class.php
index 5ddb2fc5b..3d9b7cbc4 100644
--- a/e107_handlers/media_class.php
+++ b/e107_handlers/media_class.php
@@ -378,7 +378,14 @@ class e_media
 		}
 		if($cat)
 		{
-			$catArray[] = $cat; 
+			if(strpos($cat, "|") && !strpos($cat,"+") )
+			{
+				$catArray = explode("|",$cat);	
+			}
+			else
+			{
+				$catArray[] = $cat; 
+			}
 	//		$inc[] = "media_category LIKE '%".$cat."%' "; // for multiple category field. 
 		//	$inc[] = "media_category REGEXP '(^|,)(".$cat.")(,|$)' "; // for multiple category field. 
 		}
diff --git a/e107_plugins/gallery/e_shortcode.php b/e107_plugins/gallery/e_shortcode.php
index 258a9a632..7f9ed516a 100644
--- a/e107_plugins/gallery/e_shortcode.php
+++ b/e107_plugins/gallery/e_shortcode.php
@@ -181,7 +181,7 @@ class gallery_shortcodes extends e_shortcode
 		$amount 			= $parms[1] ? intval($parms[1]) : 3; // vartrue(e107::getPlugPref('gallery','slideshow_perslide'),3);
 		$parms 				= $parms[2];
 		$limit 				= (integer) vartrue($parms['limit'], 16);
-		$list 				= e107::getMedia()->getImages('gallery_'.$this->sliderCat,0,$limit);
+		$list 				= e107::getMedia()->getImages('gallery_'.$this->sliderCat.'|gallery_image_'.$this->sliderCat,0,$limit);
 		$item_template 		= e107::getTemplate('gallery','gallery', vartrue($parms['template'], 'SLIDESHOW_SLIDE_ITEM'));
 		$catList 			= e107::getMedia()->getCategories('gallery');		
 		$cat 				= $catList['gallery_'.$this->sliderCat];