diff --git a/boot.php b/boot.php index 93180ca35..ee1b360bc 100644 --- a/boot.php +++ b/boot.php @@ -864,14 +864,14 @@ if(! function_exists('check_config')) { if($build != DB_UPDATE_VERSION) { $stored = intval($build); $current = intval(DB_UPDATE_VERSION); - if(($stored < $current) && file_exists('update.php')) { + if(($stored < $current) && file_exists('install/update.php')) { load_config('database'); // We're reporting a different version than what is currently installed. // Run any existing update scripts to bring the database up to current. - require_once('update.php'); + require_once('install/update.php'); // make sure that boot.php and update.php are the same release, we might be // updating right this very second and the correct version of the update.php diff --git a/testargs.php b/install/testargs.php similarity index 100% rename from testargs.php rename to install/testargs.php diff --git a/update.php b/install/update.php similarity index 100% rename from update.php rename to install/update.php diff --git a/mod/install.php b/mod/install.php index c71eaa49f..82c58d467 100755 --- a/mod/install.php +++ b/mod/install.php @@ -336,7 +336,7 @@ function check_php(&$phpath, &$checks) { if($passed) { $str = autoname(8); - $cmd = "$phpath testargs.php $str"; + $cmd = "$phpath install/testargs.php $str"; $result = trim(shell_exec($cmd)); $passed2 = $result == $str; $help = ""; diff --git a/version.inc b/version.inc index 531cd3d3e..da315233a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2012-10-31.124 +2012-11-01.125