clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6151 from fabrixxm/issues/6119 

dbstructure: check for comment value or use default
This commit is contained in:
Michael Vogel 2018-11-17 12:31:08 +01:00 committed by GitHub
parent 460c257cb4 c13e078c42
commit c66650f7d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Database/DBStructure.php
View File

@ -329,8 +329,9 @@ class DBStructure
} }
if (isset($database[$name]["table_status"]["Comment"])) { if (isset($database[$name]["table_status"]["Comment"])) {
if ($database[$name]["table_status"]["Comment"] != $structure['comment']) { $structurecomment = defaults($structure, "comment", "");
$sql2 = "COMMENT = '".DBA::escape($structure['comment'])."'"; if ($database[$name]["table_status"]["Comment"] != $structurecomment) {
$sql2 = "COMMENT = '".DBA::escape($structurecomment)."'";
if ($sql3 == "") { if ($sql3 == "") {
$sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2; $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;