[php-blog-cvs] serendipity/include functions_installer.inc.php,1.11,1.12

[Tom S. <tom...@us...>]

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

Modified Files:
	functions_installer.inc.php 
Log Message:
- Use a function to check for $item flags


Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- functions_installer.inc.php	3 Dec 2004 12:29:38 -0000	1.11
+++ functions_installer.inc.php	3 Dec 2004 16:13:35 -0000	1.12
@@ -647,6 +647,24 @@
 
 }
 
+/* Takes the item data from a config var, and checks the flags against the current area */
+function serendipity_checkConfigItemFlags(&$item, $area) {
+
+    if ( in_array('nosave', $item['flags']) ) {
+        return false;
+    }
+
+    if ( in_array('local', $item['flags']) && $area == 'configuration' ) {
+        return false;
+    }
+
+    if ( in_array('config', $item['flags']) && $area == 'local' ) {
+        return false;
+    }
+
+    return true;
+}
+
 function serendipity_updateConfiguration() {
     global $serendipity, $umask;
 
@@ -666,7 +684,7 @@
         foreach ( $category['items'] as $item ) {
 
             /* Don't save trash */
-            if ( in_array('local', $item['flags']) || in_array('nosave', $item['flags']) ) {
+            if ( !serendipity_checkConfigItemFlags($item, 'configuration') ) {
                 continue;
             }