mirror of
https://github.com/e107inc/e107.git
synced 2025-08-04 05:37:32 +02:00
Media-picker BC fixes.
This commit is contained in:
@@ -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)
|
||||
{
|
||||
|
@@ -495,6 +495,11 @@ class e_media
|
||||
else
|
||||
{
|
||||
$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));
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user