[geeklog-hg] geeklog: Fix for changeset f285dfa9b171

[geeklog-cvs at lists.geeklog.net]

changeset 9200:1794f0f69925
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/1794f0f69925
user: dengen <taharaxp at gmail.com>
date: Mon Jul 15 23:15:47 2013 +0900
description:
Fix for changeset f285dfa9b171

diffstat:

 system/classes/gltext.class.php |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (21 lines):

diff -r f285dfa9b171 -r 1794f0f69925 system/classes/gltext.class.php
--- a/system/classes/gltext.class.php	Mon Jul 15 18:01:23 2013 +0900
+++ b/system/classes/gltext.class.php	Mon Jul 15 23:15:47 2013 +0900
@@ -172,13 +172,12 @@
         // // Replace any $ with $ (HTML equiv)
         // $str = str_replace( '$', '$', $str);
 
-        if (SEC_hasRights('htmlfilter.skip') ||
-            (($_CONF['skip_html_filter_for_root'] == 1) && SEC_inGroup('Root'))) {
-            return $str;
+        if (!SEC_hasRights('htmlfilter.skip') &&
+            (($_CONF['skip_html_filter_for_root'] != 1) || !SEC_inGroup('Root'))) {
+
+            $str = self::_htmLawed($str, $permissions);
         }
 
-        $str = self::_htmLawed($str, $permissions);
-
         // Replace [raw][/raw] with <!--raw--><!--/raw-->, note done "late" because
         // of the above noted // strip_tags() gets confused by HTML comments ...
         $str = str_replace('[raw2]', '<!--raw--><span class="raw">', $str);