From 65ffea010d5eb20661b85d57f1b506f1928a79fe Mon Sep 17 00:00:00 2001 From: Cameron Date: Sat, 15 Nov 2014 13:30:55 -0800 Subject: [PATCH] Admin-UI: fix for boolean inline editing style. Disabled link-image replacement while in the admin area. --- e107_handlers/e_parse_class.php | 2 +- e107_handlers/form_handler.php | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php index 1fc8d9963..de3f9bfea 100644 --- a/e107_handlers/e_parse_class.php +++ b/e107_handlers/e_parse_class.php @@ -1618,7 +1618,7 @@ class e_parse extends e_parser // Convert URL's to clickable links, unless modifiers or prefs override if ($opts['link_click']) { - if ($opts['link_replace']) + if ($opts['link_replace'] && ADMIN_AREA !== true) { $_ext = ($pref['links_new_window'] ? " rel=\"external\"" : ""); $link_text = $pref['link_text']; diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index 0d250e61f..d8c88d441 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -3293,8 +3293,12 @@ class e_form if(!vartrue($attributes['noedit']) && vartrue($parms['editable']) && !vartrue($parms['link'])) // avoid bad markup, better solution coming up { - $false = vartrue($parms['trueonly']) ? "-" : "False"; - $wparms = (vartrue($parms['reverse'])) ? array(0=>'True', 1=>$false) : array(0=>$false, 1=>'True'); //TODO LAN + + $false = ($value === '') ? "□" : "✗"; + + $value = intval($value); + + $wparms = (vartrue($parms['reverse'])) ? array(0=>'✓', 1=>$false) : array(0=>$false, 1=>'✓'); //TODO LAN $dispValue = $wparms[$value]; return $this->renderInline($field, $id, $attributes['title'], $value, $dispValue, 'select', $wparms);