php-blog-cvs

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

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

Modified Files:
	serendipity_admin_installer.inc.php 
	serendipity_functions_installer.inc.php 
	serendipity_layout_table.inc.php 
Log Message:
fix installer loop of death :(


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- serendipity_admin_installer.inc.php	13 Apr 2004 16:08:01 -0000	1.61
+++ serendipity_admin_installer.inc.php	5 May 2004 11:50:20 -0000	1.62
@@ -27,7 +27,7 @@
             if (is_array($res)) {
                 echo DIAGNOSTIC_ERROR . '<br /><br />';
                 echo '<span style="color: #FF0000">- ' . implode('<br />', $res) . '</span><br /><br />';
-                serendipity_printConfigTemplate(serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE), $_POST);
+                serendipity_printConfigTemplate(serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE), $_POST, false, true, true);
                 die();
             }
 

Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_functions_installer.inc.php	4 May 2004 08:57:38 -0000	1.8
+++ serendipity_functions_installer.inc.php	5 May 2004 11:50:24 -0000	1.9
@@ -222,7 +222,7 @@
     }
 }
 
-function serendipity_printConfigTemplate($t, $from = false, $minimum = false, $folding = true) {
+function serendipity_printConfigTemplate($t, $from = false, $minimum = false, $folding = true, $_abort = true) {
     global $serendipity;
 
     if (!isset($serendipity['XHTML11'])) {
@@ -235,7 +235,7 @@
 
     // If not yet installed, do some magic:
     $abort = false;
-    if (IS_installed !== true) {
+    if (IS_installed !== true && $_abort !== true) {
         $old_htaccess = @file_get_contents('./.htaccess');
         $fp = @fopen('./.htaccess', 'w');
         $serendipity_root = str_replace(basename($_SERVER['PHP_SELF']), '', $_SERVER['PHP_SELF']);

Index: serendipity_layout_table.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_layout_table.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_layout_table.inc.php	7 Apr 2004 12:42:43 -0000	1.11
+++ serendipity_layout_table.inc.php	5 May 2004 11:50:24 -0000	1.12
@@ -8,7 +8,7 @@
 # http://www.jannis.to/programming/serendipity.html                            #
 #                                                                        #
 ##########################################################################
-include_once('serendipity_config.inc.php");
+include_once('serendipity_config.inc.php');
 include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php');
 include_once(S9Y_INCLUDE_PATH . 'serendipity_sidebar_items.php');
 
@@ -53,7 +53,7 @@
 						        echo SEARCH_TOO_SHORT;
 						        break;
 						}
-						
+
 						if ($r === true) {
 							echo sprintf(NO_ENTRIES_BLAHBLAH, $serendipity['GET']['searchTerm']);
 							break;