harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflict

Browse Source
This commit is contained in:
zotlabs
2017-05-15 22:58:13 -07:00
committed by Mario Vavti
parent b14fb1759d
commit 1a9fdc565c
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
install/update.php
View File

@@ -2475,7 +2475,7 @@ function update_r1184() {
function update_r1185() {
$r1 = q("alter table app add app_plugin char(255) not null default '' ");
$r1 = q("alter table app add app_plugin text not null default '' ");
if($r1)
return UPDATE_SUCCESS;
@@ -2523,7 +2523,7 @@ function update_r1188() {
function update_r1189() {
$r1 = q("alter table mail add mail_mimetype char(64) not null default 'text/bbcode' ");
$r1 = q("alter table mail add mail_mimetype varchar(64) not null default 'text/bbcode' ");
$r2 = q("alter table mail add mail_raw int(4) not null default '0' ");
if($r1 && $r2)