[php-blog-cvs] serendipity serendipity_admin_installer.inc.php,1.59.4.3,1.59.4.4

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

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

Modified Files:
      Tag: branch_0_6
	serendipity_admin_installer.inc.php 
Log Message:
MFH


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.59.4.3
retrieving revision 1.59.4.4
diff -u -d -r1.59.4.3 -r1.59.4.4
--- serendipity_admin_installer.inc.php	4 May 2004 08:56:49 -0000	1.59.4.3
+++ serendipity_admin_installer.inc.php	5 May 2004 11:50:51 -0000	1.59.4.4
@@ -144,7 +144,7 @@
     }
 }
 
-function serendipity_printConfigTemplate($t, $from = false) {
+function serendipity_printConfigTemplate($t, $from = false, $_abort = false) {
     global $serendipity;
 
     if (!isset($serendipity['XHTML11'])) {
@@ -153,7 +153,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']);
@@ -540,7 +540,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, true);
                 die();
             }