diff options
| author | friendica <info@friendica.com> | 2015-02-05 19:38:43 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-02-05 19:38:43 -0800 |
| commit | 4b348d248975ba07ba9cea62f51eb52d6afb5645 (patch) | |
| tree | fc60c2d05958c2a458ac72b03e1e7ddffce0c41b /install | |
| parent | aafed50a0ea8a8d7091572473dcb8e4fb8cd4602 (diff) | |
| parent | b948fbaeda84f4358722222b4a2d5555ef10b82e (diff) | |
| download | volse-hubzilla-4b348d248975ba07ba9cea62f51eb52d6afb5645.tar.gz volse-hubzilla-4b348d248975ba07ba9cea62f51eb52d6afb5645.tar.bz2 volse-hubzilla-4b348d248975ba07ba9cea62f51eb52d6afb5645.zip | |
Merge branch 'master' into tres
Conflicts:
view/css/mod_events.css
view/theme/redbasic/css/style.css
Diffstat (limited to 'install')
| -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 { |