[geeklog-cvs] geeklog: Merged changes

[geeklog-cvs at lists.geeklog.net]

changeset 8444:b3916b3329fa
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/b3916b3329fa
user: Tom <websitemaster at cogeco.net>
date: Mon Oct 10 14:24:23 2011 -0400
description:
Merged changes

diffstat:

 .hgtags                    |  1 +
 public_html/docs/history   |  6 ++++--
 public_html/lib-common.php |  6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r d70f6f00f78b -r b3916b3329fa .hgtags
--- a/.hgtags	Mon Oct 10 14:03:17 2011 -0400
+++ b/.hgtags	Mon Oct 10 14:24:23 2011 -0400
@@ -36,3 +36,4 @@
 81d3c4d522a96399b55c900cfb2d1755815d01f7 geeklog_1_8_1rc1
 81d3c4d522a96399b55c900cfb2d1755815d01f7 geeklog_1_8_1rc1
 c4f95191b80dc29c1b002ce4255d3f750b3302d2 geeklog_1_8_1rc1
+d95b3fabad63ac82d2687eb98a664a4f99e1ce88 geeklog_1_8_1_stable
diff -r d70f6f00f78b -r b3916b3329fa public_html/docs/history
--- a/public_html/docs/history	Mon Oct 10 14:03:17 2011 -0400
+++ b/public_html/docs/history	Mon Oct 10 14:24:23 2011 -0400
@@ -10,9 +10,10 @@
 - mysqli class (patch #0001303) [Dirk]
 
 
-Oct ??, 2011 (1.8.1)
-------------
-
+Oct 9, 2011 (1.8.1)
+-----------
+
+- Fixed exact match censoring option (bug #0001392) [Tom]
 - Fixed adding elements to empty Configuration arrays (bug #0001396) [Tom]
 - Blank out OAuth consumer key and secret in rootdebug dumps [Dirk]
 - Fixed deleting elements from Configuration arrays (bug #0001394, patch
diff -r d70f6f00f78b -r b3916b3329fa public_html/lib-common.php
--- a/public_html/lib-common.php	Mon Oct 10 14:03:17 2011 -0400
+++ b/public_html/lib-common.php	Mon Oct 10 14:24:23 2011 -0400
@@ -2973,12 +2973,12 @@
             switch( $_CONF['censormode'])
             {
                 case 1: # Exact match
-                    $RegExPrefix = '(\s*)';
-                    $RegExSuffix = '(\W*)';
+                    $RegExPrefix = '(\s)';
+                    $RegExSuffix = '(\W)';
                     break;
 
                 case 2: # Word beginning
-                    $RegExPrefix = '(\s*)';
+                    $RegExPrefix = '(\s)';
                     $RegExSuffix = '(\w*)';
                     break;