friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #4617 from annando/issue-4611 

Possible fix issue 4611: Don't write to database before it is created
This commit is contained in:
Tobias Diekershoff 2018-03-17 10:29:55 +01:00 committed by GitHub
parent 7207a945ce 537ef83a24
commit fea18c11ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/dba.php
View File

@ -101,6 +101,7 @@ class dba {
if (!$install) {
System::unavailable();
}
return false;
}
$a->save_timestamp($stamp1, "network");

2
mod/install.php
View File

@ -540,7 +540,7 @@ function load_database_rem($v, $i) {
}
function load_database() {
$errors = DBStructure::update(false, true);
$errors = DBStructure::update(false, true, true);
return $errors;
}

20
src/Database/DBStructure.php
View File

@ -203,8 +203,8 @@ class DBStructure
* @param array $definition An array of the definition tables
* @return string Empty string if the update is successful, error messages otherwise
*/
public static function update($verbose, $action, array $tables = null, array $definition = null) {
if ($action) {
public static function update($verbose, $action, $install = false, array $tables = null, array $definition = null) {
if ($action && !$install) {
Config::set('system', 'maintenance', 1);
Config::set('system', 'maintenance_reason', L10n::t(': Database update', DBM::date().' '.date('e')));
}
@ -455,7 +455,9 @@ class DBStructure
}
if ($action) {
Config::set('system', 'maintenance_reason', L10n::t('%s: updating %s table.', DBM::date().' '.date('e'), $name));
if (!$install) {
Config::set('system', 'maintenance_reason', L10n::t('%s: updating %s table.', DBM::date().' '.date('e'), $name));
}
// Ensure index conversion to unique removes duplicates
if ($is_unique && ($temp_name != $name)) {
@ -505,15 +507,15 @@ class DBStructure
}
}
if ($action) {
if ($action && !$install) {
Config::set('system', 'maintenance', 0);
Config::set('system', 'maintenance_reason', '');
}
if ($errors) {
Config::set('system', 'dbupdate', DB_UPDATE_FAILED);
} else {
Config::set('system', 'dbupdate', DB_UPDATE_SUCCESSFUL);
if ($errors) {
Config::set('system', 'dbupdate', DB_UPDATE_FAILED);
} else {
Config::set('system', 'dbupdate', DB_UPDATE_SUCCESSFUL);
}
}
return $errors;