diff options
| author | friendica <info@friendica.com> | 2015-02-05 15:29:36 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-02-05 15:29:36 -0800 |
| commit | b1eebaaedb58d8f4055eed1580ad29f029095195 (patch) | |
| tree | 3a173deb447c13f3b12e09f0d7132d57ab00cac8 /install/update.php | |
| parent | 68978ad1c08daeb55581b95b4328905df42c847b (diff) | |
| parent | 1abb17c88050264168b6e6ff493e73ecd12706c1 (diff) | |
| download | volse-hubzilla-b1eebaaedb58d8f4055eed1580ad29f029095195.tar.gz volse-hubzilla-b1eebaaedb58d8f4055eed1580ad29f029095195.tar.bz2 volse-hubzilla-b1eebaaedb58d8f4055eed1580ad29f029095195.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'install/update.php')
| -rw-r--r-- | install/update.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/install/update.php b/install/update.php index c6e4535e1..8ce50926a 100644 --- a/install/update.php +++ b/install/update.php @@ -1515,10 +1515,11 @@ function update_r1133() { xp_client varchar( 20 ) NOT NULL DEFAULT '', xp_channel bigint NOT NULL DEFAULT '0', xp_perm varchar( 64 ) NOT NULL DEFAULT '', - PRIMARY KEY (\"xp_id\") )"); - $r2 = q("create index \"xp_client\" on xperm (\"xp_client\", - create index \"xp_channel\" on xperm (\"xp_channel\"), - create index \"xp_perm\" on xperm (\"xp_perm\") "); + PRIMARY KEY (xp_id) )"); + $r2 = 0; + foreach(array('xp_client', 'xp_channel', 'xp_perm') as $fld) + $r2 += (empty(q("create index $fld on xperm ($fld)")) ? 0 : 1); + $r = (($r1 && $r2) ? true : false); } else { |