mirror of
https://github.com/friendica/friendica
synced 2024-12-27 10:35:14 +01:00
Merge pull request #9500 from MrPetovan/bug/9326-owner-view-blocked
[dbstructure 1373] Replace contact.blocked with user.blocked in owner-view
This commit is contained in:
commit
55f26218af
3 changed files with 3 additions and 3 deletions
|
@ -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`,
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
use Friendica\Database\DBA;
|
||||
|
||||
if (!defined('DB_UPDATE_VERSION')) {
|
||||
define('DB_UPDATE_VERSION', 1372);
|
||||
define('DB_UPDATE_VERSION', 1373);
|
||||
}
|
||||
|
||||
return [
|
||||
|
|
|
@ -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"],
|
||||
|
|
Loading…
Reference in a new issue