[geeklog-cvs] geeklog: Merged changes from Geeklog 1.8.1

[geeklog-cvs at lists.geeklog.net]

changeset 8439:b738457cb2b6
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/b738457cb2b6
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 08 13:31:45 2011 +0200
description:
Merged changes from Geeklog 1.8.1

diffstat:

 public_html/docs/history   |  6 ++++--
 public_html/lib-common.php |  6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r f88c78b4368b -r b738457cb2b6 public_html/docs/history
--- a/public_html/docs/history	Mon Oct 03 09:07:12 2011 +0200
+++ b/public_html/docs/history	Sat Oct 08 13:31:45 2011 +0200
@@ -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 f88c78b4368b -r b738457cb2b6 public_html/lib-common.php
--- a/public_html/lib-common.php	Mon Oct 03 09:07:12 2011 +0200
+++ b/public_html/lib-common.php	Sat Oct 08 13:31:45 2011 +0200
@@ -2932,12 +2932,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;