From b8e4094e7b475dd5ab980134ea463902c718a4aa Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 12 Apr 2017 23:09:22 +0200 Subject: [PATCH 1/3] Allow negative contact.contat-type https://github.com/friendica/friendica/issues/3328 --- database.sql | 2 +- include/dbstructure.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/database.sql b/database.sql index 7ed19f439..9d5695710 100644 --- a/database.sql +++ b/database.sql @@ -159,7 +159,7 @@ CREATE TABLE IF NOT EXISTS `contact` ( `writable` tinyint(1) NOT NULL DEFAULT 0, `forum` tinyint(1) NOT NULL DEFAULT 0, `prv` tinyint(1) NOT NULL DEFAULT 0, - `contact-type` int(11) unsigned NOT NULL DEFAULT 0, + `contact-type` int(11) NOT NULL DEFAULT 0, `hidden` tinyint(1) NOT NULL DEFAULT 0, `archive` tinyint(1) NOT NULL DEFAULT 0, `pending` tinyint(1) NOT NULL DEFAULT 1, diff --git a/include/dbstructure.php b/include/dbstructure.php index 48cc02d2d..9828230a1 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -5,7 +5,7 @@ use \Friendica\Core\Config; require_once("boot.php"); require_once("include/text.php"); -define('NEW_UPDATE_ROUTINE_VERSION', 1170); +define('NEW_UPDATE_ROUTINE_VERSION', 1171); /* * send the email and do what is needed to do on update fails @@ -671,7 +671,7 @@ function db_definition($charset) { "writable" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "forum" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "prv" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), - "contact-type" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"), + "contact-type" => array("type" => "int(11)", "not null" => "1", "default" => "0"), "hidden" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "archive" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "pending" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"), From 325d3afe183a397ea6688480c1b2df8e1be99dc1 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 12 Apr 2017 23:14:33 +0200 Subject: [PATCH 2/3] Bump DB version --- boot.php | 2 +- include/dbstructure.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 070dcf726..ed4fe10a3 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', 1216 ); +define ( 'DB_UPDATE_VERSION', 1217 ); /** * @brief Constant with a HTML line break. diff --git a/include/dbstructure.php b/include/dbstructure.php index 9828230a1..406ad6c93 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -5,7 +5,7 @@ use \Friendica\Core\Config; require_once("boot.php"); require_once("include/text.php"); -define('NEW_UPDATE_ROUTINE_VERSION', 1171); +define('NEW_UPDATE_ROUTINE_VERSION', 1170); /* * send the email and do what is needed to do on update fails From 92361a0209da085e1bed4de56ce46f755175142a Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 12 Apr 2017 23:20:10 +0200 Subject: [PATCH 3/3] Bump update version --- update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.php b/update.php index 8404f5bf2..4e945d209 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@