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

[friendica.git] / include / dbstructure.php

diff --git a/include/dbstructure.php b/include/dbstructure.php
index 354c06a43e9ff2c4b18da5fa03fb8f74bee6688c..3a6e0705d0debf49105c2d9d2287aefb6c741497 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -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;