Merge pull request #3585 from annando/bugfix-like-signature

Bugfix: Signatures for likes hadn't been stored

diff --git a/boot.php b/boot.php
index b69fd91c45905d3d51ba6cf57e60491ddbf9140b..977112c7b5aca98f3a257a0a3756ec1e25987d00 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -42,7 +42,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
 define ( 'FRIENDICA_VERSION',      '3.5.3-dev' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1232      );
+define ( 'DB_UPDATE_VERSION',      1233      );
 
 /**
  * @brief Constant with a HTML line break.

diff --git a/database.sql b/database.sql
index a3f937587cb52d55bb501a9adbdc395b8bd66531..604e7c7a88edc66a2209aa492fde81e999fc21eb 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 3.5.3-dev (Asparagus)
--- DB_UPDATE_VERSION 1231
+-- DB_UPDATE_VERSION 1233
 -- ------------------------------------------
 
 
@@ -944,7 +944,7 @@ CREATE TABLE IF NOT EXISTS `sign` (
        `signature` text,
        `signer` varchar(255) NOT NULL DEFAULT '',
         PRIMARY KEY(`id`),
-        INDEX `iid` (`iid`)
+        UNIQUE INDEX `iid` (`iid`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
 --

diff --git a/include/dbstructure.php b/include/dbstructure.php
index 32fd304f4ba8658177260db1a7fb9cb9c580a219..e455ee33335a2505a3d8fdb2daf33ac5e8221d9e 100644 (file)
--- a/include/dbstructure.php
+++ b/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(

diff --git a/include/diaspora.php b/include/diaspora.php
index 58a77dca8654f4f225dae35e69f444cdb3f58d6c..77c459e649830ed16e89cad5abd7340ab2ae847c 100644 (file)
--- a/include/diaspora.php
+++ b/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))
                );
 

diff --git a/update.php b/update.php
index d89e9ca06dc4e7369e65d8f05ae30d5779990a27..2b4ff76b16c4bf17171e7ecc683bb761bcdf20c7 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define('UPDATE_VERSION' , 1232);
+define('UPDATE_VERSION' , 1233);
 
 /**
  *