diff options
| author | friendica <info@friendica.com> | 2015-01-29 15:09:35 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-29 15:09:35 -0800 |
| commit | 912be23e1627211fb417c4b7bced414cbbe38ef0 (patch) | |
| tree | 2b8567d800624167b3eadf37c8855deb0ba74b0b /install/update.php | |
| parent | ff68ea608786a698ad46637ef13854ac1b1e6beb (diff) | |
| parent | 872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff) | |
| download | volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.gz volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.bz2 volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.zip | |
Merge branch 'master' into tres
Conflicts:
include/group.php
include/text.php
mod/acl.php
mod/channel.php
mod/connections.php
mod/display.php
mod/group.php
mod/item.php
mod/locs.php
mod/network.php
mod/photos.php
mod/ping.php
mod/starred.php
mod/viewsrc.php
Diffstat (limited to 'install/update.php')
| -rw-r--r-- | install/update.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/install/update.php b/install/update.php index 346b2c25a..597da4e3b 100644 --- a/install/update.php +++ b/install/update.php @@ -1540,7 +1540,9 @@ function update_r1133() { function update_r1134() { if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { - $r = q("ALTER TABLE xlink ADD xlink_static numeric(1) NOT NULL DEFAULT '0', create index xlink_static on xlink ( \"xlink_static\" ) "); + $r1 = q("ALTER TABLE xlink ADD xlink_static numeric(1) NOT NULL DEFAULT '0' "); + $r2 = q("create index xlink_static on xlink ( xlink_static ) "); + $r = $r1 && $r2; } else $r = q("ALTER TABLE xlink ADD xlink_static TINYINT( 1 ) NOT NULL DEFAULT '0', ADD INDEX ( xlink_static ) "); |