[geeklog-hg] geeklog: Merged with upstream

[geeklog-cvs at lists.geeklog.net]

changeset 9478:ad8c8e5d6d46
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/ad8c8e5d6d46
user: Kenji ITO <mystralkk at gmail.com>
date: Wed Feb 05 23:23:23 2014 +0900
description:
Merged with upstream

diffstat:

 plugins/spamx/BaseAdmin.class.php           |  7 +++++--
 plugins/spamx/EditBlackList.Admin.class.php |  4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (43 lines):

diff -r 75bd685e64fe -r ad8c8e5d6d46 plugins/spamx/BaseAdmin.class.php
--- a/plugins/spamx/BaseAdmin.class.php	Wed Feb 05 23:22:36 2014 +0900
+++ b/plugins/spamx/BaseAdmin.class.php	Wed Feb 05 23:23:23 2014 +0900
@@ -112,16 +112,19 @@
     * Adds an entry to database
     *
     * @param    string    $entry
+    * @param    string    $spaces
     * @return   boolean   true = success, false = otherwise
     */
-    protected function addEntry($entry)
+    protected function addEntry($entry, $spaces = false)
     {
         global $_TABLES;
 
         $retval = true;
 
         if (!empty($entry)) {
-            $entry = str_replace(' ', '', $entry);
+            if (!$spaces) {
+                $entry = str_replace(' ', '', $entry);
+            }
             $entry = DB_escapeString($entry);
             $count = DB_getItem(
                 $_TABLES['spamx'],
diff -r 75bd685e64fe -r ad8c8e5d6d46 plugins/spamx/EditBlackList.Admin.class.php
--- a/plugins/spamx/EditBlackList.Admin.class.php	Wed Feb 05 23:22:36 2014 +0900
+++ b/plugins/spamx/EditBlackList.Admin.class.php	Wed Feb 05 23:23:23 2014 +0900
@@ -55,12 +55,12 @@
                     break;
 
                 case $LANG_SX00['addentry']:
-                    $this->addEntry($entry);
+                    $this->addEntry($entry, true);
                     break;
 
                 case $LANG_SX00['addcen']:
                     foreach ($_CONF['censorlist'] as $entry) {
-                        $this->addEntry($entry);
+                        $this->addEntry($entry, true);
                     }
 
                     break;