[geeklog-hg] geeklog: Fixed a bug where there are cases in which the function...

[geeklog-cvs at lists.geeklog.net]

changeset 9546:8de5b63c9fc9
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/8de5b63c9fc9
user: dengen <taharaxp at gmail.com>
date: Sun Nov 02 19:49:34 2014 +0900
description:
Fixed a bug where there are cases in which the function COM_allowedHTML will return the incorrect value

diffstat:

 public_html/lib-common.php |  3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diffs (13 lines):

diff -r 4c8719977bc7 -r 8de5b63c9fc9 public_html/lib-common.php
--- a/public_html/lib-common.php	Sun Nov 02 12:53:40 2014 +0900
+++ b/public_html/lib-common.php	Sun Nov 02 19:49:34 2014 +0900
@@ -4870,6 +4870,9 @@
              ($_CONF['skip_html_filter_for_root'] == 1) &&
             SEC_inGroup('Root'))) || ($filter_html_flag == 0)) {
         $description = $LANG01[123]; // All HTML is allowed
+        if (in_array($post_mode, array('plaintext', 'wikitext'))) {
+            $description = $LANG01[131]; // No HTML is allowed
+        }
     } elseif ($filter_html_flag == 2 ||
             in_array($post_mode, array('plaintext', 'wikitext'))) {
         $description = $LANG01[131]; // No HTML is allowed