[php-blog-cvs] serendipity/include functions_config.inc.php,1.7,1.8 functions_installer.inc.php,1.18,1.19

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3789/include

Modified Files:
	functions_config.inc.php functions_installer.inc.php 
Log Message:
* since 'nosave' vars are no longer stored in the DB, we need to remove them from the DB or problems arise that you can't change a config value. (see mailinglist)
* fixed remaining spelling mistake :)


Index: functions_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_config.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- functions_config.inc.php	9 Dec 2004 10:39:24 -0000	1.7
+++ functions_config.inc.php	10 Dec 2004 10:59:05 -0000	1.8
@@ -1,5 +1,11 @@
 <?php # $Id$
 
+function serendipity_remove_config_var($name, $authorid = 0) {
+    global $serendipity;
+
+    serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}config where name='" . serendipity_db_escape_string($name) . "' AND authorid = " . (int)$authorid);
+}
+
 function serendipity_set_config_var($name, $val, $authorid = 0) {
     global $serendipity;
 

Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- functions_installer.inc.php	9 Dec 2004 22:18:02 -0000	1.18
+++ functions_installer.inc.php	10 Dec 2004 10:59:05 -0000	1.19
@@ -797,4 +797,19 @@
         return $default;
     }
 }
+
+function serendipity_removeObsoleteVars() {
+global $serendipity;
+
+    $config = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE);
+    foreach($config as $category) {
+        foreach($category['items'] as $item) {
+            /* Remove trash */
+            if (!serendipity_checkConfigItemFlags($item, 'remove')) {
+                serendipity_remove_config_var($item['var'], 0);
+            }
+        }
+    }
+}
+
 ?>