[geeklog-hg] geeklog: Merged with HEAD

[geeklog-cvs at lists.geeklog.net]

changeset 9418:e07d894bb274
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/e07d894bb274
user: Kenji ITO <mystralkk at gmail.com>
date: Sun Jan 12 22:09:09 2014 +0900
description:
Merged with HEAD

diffstat:

 public_html/admin/topic.php |   2 +-
 public_html/lib-common.php  |  16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diffs (51 lines):

diff -r 2ef970c88acc -r e07d894bb274 public_html/admin/topic.php
--- a/public_html/admin/topic.php	Sun Jan 12 16:15:46 2014 +0900
+++ b/public_html/admin/topic.php	Sun Jan 12 22:09:09 2014 +0900
@@ -202,7 +202,7 @@
     $topic_templates->set_var('default_limit', $_CONF['limitnews']);
     $topic_templates->set_var('lang_defaultis', $LANG27[16]);
     $topic_templates->set_var('lang_topicname', $LANG27[3]);
-    $topic_templates->set_var('topic_name', stripslashes ($A['topic']));
+    $topic_templates->set_var('topic_name', htmlspecialchars(stripslashes($A['topic']), ENT_QUOTES, COM_getEncodingt()));
     if (empty($A['tid'])) {
         $A['imageurl'] = '/images/topics/';
     }
diff -r 2ef970c88acc -r e07d894bb274 public_html/lib-common.php
--- a/public_html/lib-common.php	Sun Jan 12 16:15:46 2014 +0900
+++ b/public_html/lib-common.php	Sun Jan 12 22:09:09 2014 +0900
@@ -4849,21 +4849,17 @@
     global $_CONF, $LANG01;
 
     $retval = '';
-    $has_skiphtmlfilterPermissions = SEC_hasRights ('htmlfilter.skip');
     $has_list = false;
-    if (($has_skiphtmlfilterPermissions || (isset($_CONF['skip_html_filter_for_root']) &&
+    if ((SEC_hasRights('htmlfilter.skip') || (isset($_CONF['skip_html_filter_for_root']) &&
              ($_CONF['skip_html_filter_for_root'] == 1) &&
             SEC_inGroup('Root'))) || ($filter_html_flag == 0)) {
         $description = $LANG01[123]; // All HTML is allowed
-    } elseif ($filter_html_flag == 2) {
+    } elseif ($filter_html_flag == 2 ||
+            in_array($post_mode, array('plaintext', 'wikitext'))) {
         $description = $LANG01[131]; // No HTML is allowed
     } else {
-        if (in_array($post_mode, array('plaintext', 'wikitext'))) {
-            $description = $LANG01[131]; // No HTML is allowed
-        } else {
-            $has_list = true;
-            $description = $LANG01[31];  // Allowed HTML Tags:
-        }
+        $has_list = true;
+        $description = $LANG01[31];  // Allowed HTML Tags:
     }
 
     if (!$list_only) {
@@ -4950,7 +4946,7 @@
                  . $list . '</div>';
     }
 
-    $retval = '<div class="allowed_autotags">' . $retval . '</div>';
+    $retval = '<div dir="ltr" class="allowed_autotags">' . $retval . '</div>';
 
     return $retval;
 }