[geeklog-cvs] geeklog: Fix name of the "Spam-X Actions" config option, which w...

[geeklog-cvs at lists.geeklog.net]

changeset 8679:f8d36af1b0c3
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/f8d36af1b0c3
user: Dirk Haun <dirk at haun-online.de>
date: Sat May 05 19:47:00 2012 +0200
description:
Fix name of the "Spam-X Actions" config option, which we accidentally renamed to spamx_name in an earlier version ...

diffstat:

 plugins/spamx/functions.inc |  18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diffs (40 lines):

diff -r 645d382ca3ca -r f8d36af1b0c3 plugins/spamx/functions.inc
--- a/plugins/spamx/functions.inc	Sat May 05 17:54:26 2012 +0200
+++ b/plugins/spamx/functions.inc	Sat May 05 19:47:00 2012 +0200
@@ -277,25 +277,29 @@
                 foreach ($_SQL as $sql) {
                     DB_query($sql);
                 }
-            }            
+            }
 
             if (! $current_config) {
-                // Update to Config Tables must be performed here and not in regualar SQL update array since if config is current then they shouldn't be run   
+                // Update to Config Tables must be performed here and not in regular SQL update array since if config is current then they shouldn't be run   
                 // Set new Tab column to whatever fieldset is
                 $sql = "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'spamx'";
                 DB_query($sql);
-                
+
                 // Rename the action config option since it is causes JavaScript issues in the config and IE 8
-                $sql = "UPDATE {$_TABLES['conf_values']} SET name = 'spamx_name' WHERE name = 'action'";
+                $sql = "UPDATE {$_TABLES['conf_values']} SET name = 'spamx_action' WHERE name = 'action' AND group_name = 'spamx'";
+                DB_query($sql);
+
+                // in an earlier update we accidentally renamed the 'action' option to 'spamx_name' - fix that
+                $sql = "UPDATE {$_TABLES['conf_values']} SET name = 'spamx_action' WHERE name = 'spamx_name' AND group_name = 'spamx'";
                 DB_query($sql);   
-                
+
                 spamx_update_ConfValues_1_2_2();
             }
-            
+
             spamx_update_ConfigSecurity_1_2_2();
 
             $current_version = '1.3.0';
-            break;            
+            break;
 
         default:
             $done = true;