move some more stuff to the install directory
This commit is contained in:
parent
3f7530417a
commit
ec6ed3221d
4
boot.php
4
boot.php
@ -864,14 +864,14 @@ if(! function_exists('check_config')) {
|
|||||||
if($build != DB_UPDATE_VERSION) {
|
if($build != DB_UPDATE_VERSION) {
|
||||||
$stored = intval($build);
|
$stored = intval($build);
|
||||||
$current = intval(DB_UPDATE_VERSION);
|
$current = intval(DB_UPDATE_VERSION);
|
||||||
if(($stored < $current) && file_exists('update.php')) {
|
if(($stored < $current) && file_exists('install/update.php')) {
|
||||||
|
|
||||||
load_config('database');
|
load_config('database');
|
||||||
|
|
||||||
// We're reporting a different version than what is currently installed.
|
// We're reporting a different version than what is currently installed.
|
||||||
// Run any existing update scripts to bring the database up to current.
|
// 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
|
// 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
|
// updating right this very second and the correct version of the update.php
|
||||||
|
@ -336,7 +336,7 @@ function check_php(&$phpath, &$checks) {
|
|||||||
|
|
||||||
if($passed) {
|
if($passed) {
|
||||||
$str = autoname(8);
|
$str = autoname(8);
|
||||||
$cmd = "$phpath testargs.php $str";
|
$cmd = "$phpath install/testargs.php $str";
|
||||||
$result = trim(shell_exec($cmd));
|
$result = trim(shell_exec($cmd));
|
||||||
$passed2 = $result == $str;
|
$passed2 = $result == $str;
|
||||||
$help = "";
|
$help = "";
|
||||||
|
@ -1 +1 @@
|
|||||||
2012-10-31.124
|
2012-11-01.125
|
||||||
|
Reference in New Issue
Block a user