mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 04:40:44 +02:00
Code Issues Releases Wiki Activity

Media-picker BC fixes.

Browse Source
This commit is contained in:
Cameron
2018-08-06 14:11:28 -07:00
parent f1a3e207db
commit 2a842bd3f4
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_admin/image.php
View File

@@ -1761,8 +1761,10 @@ class media_admin_ui extends e_admin_ui
$search = !empty($option['search']) ? $option['search'] : null; $search = !empty($option['search']) ? $option['search'] : null;
$cat = ($category) ? $category."+" : ""; // the '+' loads category '_common' as well as the chosen category. // $cat = ($category) ? $category."+" : "";
$images = e107::getMedia()->getImages($cat,$frm,$limit,$search); $images = e107::getMedia()->getImages($category,$frm,$limit,$search);
foreach($images as $val) foreach($images as $val)
{ {

9
e107_handlers/media_class.php
View File

@@ -494,7 +494,12 @@ class e_media
} }
else 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)); // $previewURL = $tp->thumbUrl($default, array('w'=>800));