From 29ddbe09e855dc2fae2fb1edb453586935514b3f Mon Sep 17 00:00:00 2001 From: Cameron Date: Sun, 10 May 2015 11:16:55 -0700 Subject: [PATCH] Fixes #1002 - Filepicker mode was not being detected by media-manager. --- e107_admin/image.php | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/e107_admin/image.php b/e107_admin/image.php index 98f70bd4e..a10e2def2 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -577,14 +577,26 @@ class media_form_ui extends e_admin_form_ui // $save = ($_GET['bbcode']!='file') ? "e-dialog-save" : ""; // e-dialog-close - - // File Picker. - if($_GET['action'] == 'dialog') + $for = $this->getController()->getQuery('for'); + + if(strpos($for, '_file') !==false) + { + $type = 'file'; + } + else + { + $type = 'image'; + } + + // File Picker. + if($_GET['action'] == 'dialog' && ($type == 'file')) { $text = ""; } - - $text = $this->renderValue('options',$value,'',$id); + else + { + $text = $this->renderValue('options',$value,'',$id); + } return "
".$text."
";