mirror of
https://github.com/e107inc/e107.git
synced 2025-03-14 01:19:44 +01:00
Media-Manager ajax filter fix.
This commit is contained in:
parent
a09e8605c5
commit
a7d637b02f
@ -37,10 +37,10 @@ if($info = e107::getLibrary()->load('bootstrap'))
|
||||
|
||||
include_once(e107::coreTemplatePath('admin_icons')); // Needs to be loaded before infopanel AND in boot.php
|
||||
|
||||
if(vartrue($_GET['iframe']) == 1)
|
||||
/*if(vartrue($_GET['iframe']) == 1)
|
||||
{
|
||||
define('e_IFRAME', true);
|
||||
}
|
||||
}*/
|
||||
|
||||
|
||||
|
||||
|
@ -20,7 +20,7 @@ header('Content-type: text/html; charset=utf-8', TRUE);
|
||||
define('ADMINFEED', 'https://e107.org/adminfeed');
|
||||
|
||||
|
||||
if(!empty($_GET['iframe'])) // global iframe support.
|
||||
if(!empty($_GET['iframe']) && !defined('e_IFRAME')) // global iframe support.
|
||||
{
|
||||
define('e_IFRAME', true);
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1725,7 +1725,7 @@ class e_media
|
||||
|
||||
// $text .= print_a($_GET,true);
|
||||
|
||||
$data_src = $this->mediaSelectNav($parm['category'], $parm['tagid'], $parm);
|
||||
$data_src = $this->mediaSelectNav(varset($parm['category']), $parm['tagid'], $parm);
|
||||
$carouselID = 'media-carousel-'.$parm['action'];
|
||||
$searchToolttip = (empty($parm['searchTooltip'])) ? IMALAN_186 : $parm['searchTooltip'];
|
||||
//$text = "<form class='form-search' action='".e_SELF."?".e_QUERY."' id='core-plugin-list-form' method='get'>";
|
||||
@ -1810,7 +1810,7 @@ class e_media
|
||||
|
||||
$val['width'] = $parm['width'];
|
||||
$val['height'] = $parm['height'];
|
||||
$val['id'] = $parm['id'];
|
||||
$val['id'] = varset($parm['id']);
|
||||
$val['tagid'] = $parm['tagid'];
|
||||
$val['type'] = $parm['type'];
|
||||
$val['bbcode'] = $parm['bbcode'];
|
||||
|
Loading…
x
Reference in New Issue
Block a user