Merge remote-tracking branch 'friendica/develop' into Issue-#2816-2

This commit is contained in:
Hypolite Petovan
2016-10-03 19:04:57 -04:00
28 changed files with 141 additions and 82 deletions

View File

@@ -130,6 +130,9 @@ function print_structure($database, $charset) {
function update_structure($verbose, $action, $tables=null, $definition=null) {
global $a, $db;
if ($action)
set_config('system', 'maintenance', 1);
if (isset($a->config["system"]["db_charset"]))
$charset = $a->config["system"]["db_charset"];
else
@@ -251,6 +254,9 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
}
}
if ($action)
set_config('system', 'maintenance', 0);
return $errors;
}