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

diff --combined include/dbstructure.php
index 354c06a43e9ff2c4b18da5fa03fb8f74bee6688c,76ba37e37c0a519ef241a83dd65eca9639b8d5d5..3a6e0705d0debf49105c2d9d2287aefb6c741497
--- 1/include/dbstructure.php
--- 2/include/dbstructure.php
+++ b/include/dbstructure.php
@@@ -151,9 -151,9 +151,9 @@@ function update_structure($verbose, $ac
                          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;
@@@ -925,7 -925,6 +925,7 @@@ function db_definition() 
                                        "msg" => array("type" => "mediumtext", "not null" => "1"),
                                        "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "link" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 +                                      "iid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "parent" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "seen" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "verb" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),