Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-23 23:50:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1504-condensed-notifications

Browse source
This commit is contained in:
Michael Vogel 2015-04-21 10:13:28 +02:00
commit 261cd441c7
35 changed files with 1467 additions and 1019 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/dbstructure.php
View file

@ -151,9 +151,9 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
if(false === $r)
$errors .= t('Errors encountered creating database tables.').$name.EOL;
} else {
// Drop the index if it isn't present in the definition
// Drop the index if it isn't present in the definition and index name doesn't start with "local_"
foreach ($database[$name]["indexes"] AS $indexname => $fieldnames)
if (!isset($structure["indexes"][$indexname])) {
if (!isset($structure["indexes"][$indexname]) && substr($indexname, 0, 6) != 'local_') {
$sql2=db_drop_index($indexname);
if ($sql3 == "")
$sql3 = "ALTER TABLE `".$name."` ".$sql2;