Wrong parameter for delete command

diff --git a/boot.php b/boot.php
index dfb1073b1cd0b0377dfd5199073aecc9298ed04a..45029fecd2eaf174bf877cd5ffcd19b7f3cd5f13 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -38,7 +38,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
 define ( 'FRIENDICA_VERSION',      '3.5.2-dev' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1223      );
+define ( 'DB_UPDATE_VERSION',      1224      );
 
 /**
  * @brief Constant with a HTML line break.

diff --git a/include/dba.php b/include/dba.php
index 0072660929cea8db9d23b9b17032d1dc283e71b3..dbb3f166aa1e909acb9f3113347c78f99f9ec949 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -914,7 +914,7 @@ class dba {
 
                                                logger(dba::replace_parameters($sql, $field_values), LOGGER_DATA);
 
-                                               if (!self::e($sql, $param)) {
+                                               if (!self::e($sql, $field_values)) {
                                                        self::p("ROLLBACK");
                                                        return false;
                                                }

diff --git a/include/dbstructure.php b/include/dbstructure.php
index 8c29eb641526f619d9cc9c330e6f38c004bfedd0..e8f1738a7dee01c5f5ee3bc72167250ca03e2a9d 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -1218,6 +1218,7 @@ function db_definition() {
                                        "convid" => array("convid"),
                                        "uri" => array("uri(64)"),
                                        "parent-uri" => array("parent-uri(64)"),
+                                       "contactid" => array("contact-id"),
                                        )
                        );
        $database["mailacct"] = array(
@@ -1355,6 +1356,7 @@ function db_definition() {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
+                                       "contactid" => array("contact-id"),
                                        "uid_contactid" => array("uid", "contact-id"),
                                        "uid_profile" => array("uid", "profile"),
                                        "uid_album_scale_created" => array("uid", "album(32)", "scale", "created"),

diff --git a/update.php b/update.php
index 31a3068ea5ff477204da0b0d06d14d8901f4fb72..e3b1c31b33a5fee9cc01c8c97eb11b6877ef7a3c 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define('UPDATE_VERSION' , 1223);
+define('UPDATE_VERSION' , 1224);
 
 /**
  *