[geeklog-cvs] geeklog: Removing an element from the middle of the censorlist c...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/32e4014e6a01
changeset: 6454:32e4014e6a01
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Oct 18 16:05:06 2008 +0200
description:
Removing an element from the middle of the censorlist caused the censoring to act up (bug #0000763)

diffstat:

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

diffs (31 lines):

diff -r 3c2463b7162f -r 32e4014e6a01 public_html/docs/history
--- a/public_html/docs/history	Tue Oct 14 22:59:36 2008 +0200
+++ b/public_html/docs/history	Sat Oct 18 16:05:06 2008 +0200
@@ -3,6 +3,8 @@
 ??? ??, 2008 (1.5.2)
 ------------
 
+- Removing an element from the middle of the censorlist caused the censoring
+  to act up (bug #0000763) [Dirk]
 - Saving a story tried to update a feed of type 'geeklog' instead of 'article'
   (reported by Tom Homer)
 - Delete a feed's file when deleting a feed (bug #0000758) [Dirk]
diff -r 3c2463b7162f -r 32e4014e6a01 public_html/lib-common.php
--- a/public_html/lib-common.php	Tue Oct 14 22:59:36 2008 +0200
+++ b/public_html/lib-common.php	Sat Oct 18 16:05:06 2008 +0200
@@ -2869,10 +2869,11 @@
                     break;
             }
 
-            $censor_entries = count( $_CONF['censorlist'] );
-            for( $i = 0; $i < $censor_entries; $i++ )
-            {
-                $EditedMessage = MBYTE_eregi_replace( $RegExPrefix . $_CONF['censorlist'][$i] . $RegExSuffix, "\\1$Replacement\\2", $EditedMessage );
+            foreach ($_CONF['censorlist'] as $c) {
+                if (!empty($c)) {
+                    $EditedMessage = MBYTE_eregi_replace($RegExPrefix . $c
+                        . $RegExSuffix, "\\1$Replacement\\2", $EditedMessage);
+                }
             }
         }
     }