[php-blog-cvs] serendipity serendipity_admin_upgrader.inc.php,1.21.2.1,1.21.2.2 serendipity_config.inc.php,1.93.2.6,1.93.2.7

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_admin_upgrader.inc.php serendipity_config.inc.php 
Log Message:
* new version for branch (0.8-CVS-1, that's what we agreed upon, right? If not, please change ;)
* fix foreach-error when no sql files where found


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.93.2.6
retrieving revision 1.93.2.7
diff -u -d -r1.93.2.6 -r1.93.2.7
--- serendipity_config.inc.php	19 Sep 2004 20:06:35 -0000	1.93.2.6
+++ serendipity_config.inc.php	20 Sep 2004 10:27:08 -0000	1.93.2.7
@@ -15,7 +15,7 @@
 
 include_once(S9Y_INCLUDE_PATH . 'compat.php');
 
-$serendipity['version']         = '0.7-beta3';
+$serendipity['version']         = '0.8-CVS-1';
 $serendipity['defaultTemplate'] = 'default'; // Name of folder for the default theme
 $serendipity['production']      = 1;
 $serendipity['rewrite']         = 'none';

Index: serendipity_admin_upgrader.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_upgrader.inc.php,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -d -r1.21.2.1 -r1.21.2.2
--- serendipity_admin_upgrader.inc.php	16 Sep 2004 18:07:44 -0000	1.21.2.1
+++ serendipity_admin_upgrader.inc.php	20 Sep 2004 10:27:08 -0000	1.21.2.2
@@ -48,11 +48,13 @@
 }
 
 $sqlfiles = array();
-foreach ( $tmpFiles as $version => $db ) {
-    if ( array_key_exists($serendipity['dbType'], $db) === false  ) {
-        $sqlfiles[$version] = $db['mysql'];
-    } else {
-        $sqlfiles[$version] = $db[$serendipity['dbType']];
+if (is_array($tmpFiles)) {
+    foreach ($tmpFiles as $version => $db) {
+        if (array_key_exists($serendipity['dbType'], $db) === false ) {
+            $sqlfiles[$version] = $db['mysql'];
+        } else {
+            $sqlfiles[$version] = $db[$serendipity['dbType']];
+        }
     }
 }