From 254b5ae07ae747923d39b801de96d9752ee177a7 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 8 Nov 2020 02:23:28 -0500 Subject: [PATCH] [dbstructure 1373] Replace contact.blocked with user.blocked in owner-view - It was falsely reporting blocked users as unblocked since we don't block the public self contact --- database.sql | 2 +- static/dbstructure.config.php | 2 +- static/dbview.config.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/database.sql b/database.sql index d3e75e753e..250615b402 100644 --- a/database.sql +++ b/database.sql @@ -1574,7 +1574,7 @@ CREATE VIEW `owner-view` AS SELECT `contact`.`term-date` AS `term-date`, `contact`.`last-item` AS `last-item`, `contact`.`priority` AS `priority`, - `contact`.`blocked` AS `blocked`, + `user`.`blocked` AS `blocked`, `contact`.`block_reason` AS `block_reason`, `contact`.`readonly` AS `readonly`, `contact`.`writable` AS `writable`, diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index a3b94e0b27..8d27083058 100755 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -54,7 +54,7 @@ use Friendica\Database\DBA; if (!defined('DB_UPDATE_VERSION')) { - define('DB_UPDATE_VERSION', 1372); + define('DB_UPDATE_VERSION', 1373); } return [ diff --git a/static/dbview.config.php b/static/dbview.config.php index ff8600b3da..5c18364262 100755 --- a/static/dbview.config.php +++ b/static/dbview.config.php @@ -181,7 +181,7 @@ return [ "term-date" => ["contact", "term-date"], "last-item" => ["contact", "last-item"], "priority" => ["contact", "priority"], - "blocked" => ["contact", "blocked"], /// @todo Check if "blocked" from contact or from the users table + "blocked" => ["user", "blocked"], "block_reason" => ["contact", "block_reason"], "readonly" => ["contact", "readonly"], "writable" => ["contact", "writable"],