Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach

include/dbstructure.php

@@ -1572,7 +1572,7 @@ function db_definition() {
 					),
 			"indexes" => array(
 					"PRIMARY" => array("id"),
-					"iid" => array("iid"),
+					"iid" => array("UNIQUE", "iid"),
 					)
 			);
 	$database["spam"] = array(

include/diaspora.php

@@ -3729,7 +3729,7 @@ class Diaspora {
 		 * This will break Diaspora compatibility with Friendica versions prior to 3.5.
 		 */
 		q("INSERT INTO `sign` (`iid`,`signed_text`) VALUES (%d,'%s')",
-			intval($message_id),
+			intval($post_id),
 			dbesc(json_encode($message))
 		);