From 5d46ffe410335de71b03844c38f58d93d2b38768 Mon Sep 17 00:00:00 2001 From: Cameron Date: Sat, 5 Jul 2014 20:27:03 -0700 Subject: [PATCH] Issue #619 - media-manager icon issue on non-image files. --- e107_handlers/e_parse_class.php | 7 +++++++ e107_handlers/form_handler.php | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php index ae6d06a99..b4957901f 100644 --- a/e107_handlers/e_parse_class.php +++ b/e107_handlers/e_parse_class.php @@ -2714,11 +2714,18 @@ class e_parser return false; } + + if(is_array($space)) { $parm = $space; $space = varset($parm['space'],''); } + elseif(strpos($space,'=')) + { + parse_str($space,$parm); + $space = varset($parm['space'],''); + } else { $parm = array(); diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index b712f46f2..7d2182ba5 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -2865,7 +2865,7 @@ class e_form case 'image': //TODO - thumb, js tooltip... if($value) { - + if(strpos($value,",")!==false) { $tmp = explode(",",$value); @@ -2885,7 +2885,8 @@ class e_form { $icon = "{e_IMAGE}filemanager/zip_32.png"; $src = $tp->replaceConstants(vartrue($parms['pre']).$icon, 'abs'); - // return ''.$value.''; + return e107::getParser()->toGlyph('fa-file','size=2x'); + // return ''.$value.''; } if(vartrue($parms['thumb']))