[geeklog-hg] geeklog: Fix and optimization for changeset 0e62a27a1151
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Sun Jan 12 03:41:43 EST 2014
changeset 9416:1f379def9cd9
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/1f379def9cd9
user: dengen <taharaxp at gmail.com>
date: Sun Jan 12 17:40:43 2014 +0900
description:
Fix and optimization for changeset 0e62a27a1151
diffstat:
public_html/lib-common.php | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diffs (39 lines):
diff -r 0e62a27a1151 -r 1f379def9cd9 public_html/lib-common.php
--- a/public_html/lib-common.php Sun Jan 12 14:25:30 2014 +0900
+++ b/public_html/lib-common.php Sun Jan 12 17:40:43 2014 +0900
@@ -4844,21 +4844,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) {
@@ -4945,7 +4941,7 @@
. $list . '</div>';
}
- $retval = '<div class="allowed_autotags">' . $retval . '</div>';
+ $retval = '<div dir="ltr" class="allowed_autotags">' . $retval . '</div>';
return $retval;
}
More information about the geeklog-cvs
mailing list