[Comoblog-commit] comoblog/_install upgrade_2.php,1.1,1.2

[Mark W. \(a. serialmonkey\) <mar...@us...>]

Update of /cvsroot/comoblog/comoblog/_install
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18942

Modified Files:
	upgrade_2.php 
Log Message:
Ensure that the folder/path parameters are prepopulated and a failed attempt

Index: upgrade_2.php
===================================================================
RCS file: /cvsroot/comoblog/comoblog/_install/upgrade_2.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- upgrade_2.php	9 Oct 2005 14:11:35 -0000	1.1
+++ upgrade_2.php	11 Oct 2005 23:18:14 -0000	1.2
@@ -84,14 +84,13 @@
       exit();
    }
 }
-else
-{
-   $current_path = dirname(__FILE__);
-   $current_script = basename($_SERVER['PHP_SELF']);
-   $AUTO_DETECTED['base_path'] = substr($current_path, 0, strlen($current_path) - strlen($current_script) + 4);
-   $current_url = 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'];
-   $AUTO_DETECTED['site_url'] = substr($current_url, 0, strlen($current_url) - strlen('/_install/upgrade_2.php')) . '/'; 
-}
+
+$current_path = dirname(__FILE__);
+$current_script = basename($_SERVER['PHP_SELF']);
+$AUTO_DETECTED['base_path'] = substr($current_path, 0, strlen($current_path) - strlen($current_script) + 4);
+$current_url = 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'];
+$AUTO_DETECTED['site_url'] = substr($current_url, 0, strlen($current_url) - strlen('/_install/upgrade_2.php')) . '/'; 
+$AUTO_DETECTED['old_path']=$_POST['old_path'];
 
 $tpl = @new XTemplate ('templates/upgrade_2.tpl.htm', 'main'); 
 
@@ -105,8 +104,8 @@
       $tpl->parse('main.errors');
    }      
 }
-else
-   $tpl->assign('POST', $AUTO_DETECTED);
+
+$tpl->assign('POST', $AUTO_DETECTED);
 
 $tpl->parse('main');
 $tpl->out('main');