From 7a3bdbfc152f385d4eba38d44b3731d4c79f008e Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 7 May 2017 08:12:36 +0000 Subject: [PATCH] Wrong parameter for delete command --- boot.php | 2 +- include/dba.php | 2 +- include/dbstructure.php | 2 ++ update.php | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index dfb1073b1c..45029fecd2 100644 --- 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 0072660929..dbb3f166aa 100644 --- 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 8c29eb6415..e8f1738a7d 100644 --- 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 31a3068ea5..e3b1c31b33 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@