aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-09-10 17:12:48 -0700
committerfriendica <info@friendica.com>2013-09-10 17:12:48 -0700
commit7ada499ca9a1424a59204d87edb5856f88a79b59 (patch)
treeaf1b87755abe9c5276a07869ee5a7d5729d71fd7 /boot.php
parent72f562c190630e69fa5a223855cd6f3a3bc66e49 (diff)
parent5aaf8b8e9940d99befd00619238cd20c3894e5a9 (diff)
downloadvolse-hubzilla-7ada499ca9a1424a59204d87edb5856f88a79b59.tar.gz
volse-hubzilla-7ada499ca9a1424a59204d87edb5856f88a79b59.tar.bz2
volse-hubzilla-7ada499ca9a1424a59204d87edb5856f88a79b59.zip
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php6
1 files changed, 1 insertions, 5 deletions
diff --git a/boot.php b/boot.php
index 4c2e27f93..ed645f6ea 100755
--- a/boot.php
+++ b/boot.php
@@ -43,7 +43,7 @@ require_once('include/taxonomy.php');
define ( 'RED_PLATFORM', 'Red Matrix' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'ZOT_REVISION', 1 );
-define ( 'DB_UPDATE_VERSION', 1068 );
+define ( 'DB_UPDATE_VERSION', 1069 );
define ( 'EOL', '<br />' . "\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
@@ -1206,7 +1206,6 @@ function check_config(&$a) {
// 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('install/update.php');
// make sure that boot.php and update.php are the same release, we might be
@@ -1214,10 +1213,8 @@ function check_config(&$a) {
// file may not be here yet. This can happen on a very busy site.
if(DB_UPDATE_VERSION == UPDATE_VERSION) {
-
for($x = $stored; $x < $current; $x ++) {
if(function_exists('update_r' . $x)) {
-
// There could be a lot of processes running or about to run.
// We want exactly one process to run the update command.
// So store the fact that we're taking responsibility
@@ -1229,7 +1226,6 @@ function check_config(&$a) {
if(get_config('database','update_r' . $x))
break;
set_config('database','update_r' . $x, '1');
-
// call the specific update
$func = 'update_r' . $x;