diff options
| author | zotlabs <mike@macgirvin.com> | 2017-05-15 22:58:13 -0700 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-05-20 22:57:38 +0200 |
| commit | e32e6160312d199290797fb67a5d59435786b228 (patch) | |
| tree | c1e5c9bf7e9674789c42514814844a53a497577d /install/update.php | |
| parent | 335de94343a3eb4dcce172514eed0701e79f4d44 (diff) | |
| download | volse-hubzilla-e32e6160312d199290797fb67a5d59435786b228.tar.gz volse-hubzilla-e32e6160312d199290797fb67a5d59435786b228.tar.bz2 volse-hubzilla-e32e6160312d199290797fb67a5d59435786b228.zip | |
resolve merge conflict
Diffstat (limited to 'install/update.php')
| -rw-r--r-- | install/update.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/install/update.php b/install/update.php index ca347e4c2..06084a422 100644 --- a/install/update.php +++ b/install/update.php @@ -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) |