mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-03-14 01:19:44 +01:00
Code Issues Releases Wiki Activity

Fixes #2206 Gallery shortcode category not being respected. eg. {GALLERY_PORTFOLIO: placeholder=1&category=2}

Browse Source
This commit is contained in:
Cameron 2016-12-30 14:45:22 -08:00
parent 836f09a122
commit 10f1a4246c
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
e107_handlers/media_class.php
View File

@ -482,7 +482,9 @@ class e_media
$query = "SELECT ".$fields." FROM #core_media WHERE `media_category` REGEXP '(^|,)".implode("|",$catArray)."(,|$)' AND `media_userclass` IN (".USERCLASS_LIST.") " ;
// $query = "SELECT ".$fields." FROM #core_media WHERE media_userclass IN (".USERCLASS_LIST.") AND ( ".implode(" OR ",$inc)." ) " ;
if($search)
{
$query .= " AND ( ".implode(" OR ",$searchinc)." ) " ;
@ -507,6 +509,9 @@ class e_media
{
$query .= " LIMIT ".$from." ,".$amount;
}
// e107::getDebug()->log($query);
e107::getDb()->gen($query);
while($row = e107::getDb()->fetch())
{

6
e107_plugins/gallery/e_shortcode.php
View File

@ -211,7 +211,7 @@ class gallery_shortcodes extends e_shortcode
{
$ns = e107::getRender();
$parm = eHelper::scParams($parms);
$cat = (!empty($parm['category'])) ? $parm['category'] : vartrue(e107::getPlugPref('gallery', 'slideshow_category'), 1); //TODO Separate pref?
$cat = (!empty($parm['category'])) ? $parm['category'] : vartrue(e107::getPlugPref('gallery', 'slideshow_category'), false); //TODO Separate pref?
$tmpl = e107::getTemplate('gallery', 'gallery');
$limit = vartrue($parm['limit'], 6);
@ -219,7 +219,9 @@ class gallery_shortcodes extends e_shortcode
$plugPrefs = e107::getPlugConfig('gallery')->getPref();
$orderBy = varset($plugPrefs['orderby'], 'media_id DESC');
$list = e107::getMedia()->getImages('gallery_image|gallery_' . $cat . '|gallery_image_' . $cat, 0, $limit, null, $orderBy);
$imageQry = (empty($cat)) ? "gallery_image|gallery_image_1|gallery_1" : 'gallery_' . $cat . '|gallery_image_' . $cat;
$list = e107::getMedia()->getImages($imageQry, 0, $limit, null, $orderBy);
if(count($list) < 1 && vartrue($parm['placeholder']))
{