https://reisub.nsupdate.info/git
/
friendica.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
631095e
)
Update: Don't throw an error if the target field already exists
author
Michael
<heluecht@pirati.ca>
Thu, 16 Jul 2020 10:23:56 +0000
(10:23 +0000)
committer
Michael
<heluecht@pirati.ca>
Thu, 16 Jul 2020 10:23:56 +0000
(10:23 +0000)
update.php
patch
|
blob
|
history
diff --git
a/update.php
b/update.php
index
8301110
..
1448d81
100644
(file)
--- a/
update.php
+++ b/
update.php
@@
-513,6
+513,7
@@
function update_1351()
function pre_update_1354()
{
if (DBStructure::existsColumn('contact', ['ffi_keyword_blacklist'])
+ && !DBStructure::existsColumn('contact', ['ffi_keyword_denylist'])
&& !DBA::e("ALTER TABLE `contact` CHANGE `ffi_keyword_blacklist` `ffi_keyword_denylist` text null")) {
return Update::FAILED;
}