keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13230 from annando/warnings

Browse source 
Fix warnings because of missing field
This commit is contained in:
Hypolite Petovan 2023-06-23 17:54:22 -04:00 committed by GitHub
commit f9f85e3865
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
database.sql
View file

@ -1,6 +1,6 @@
-- ------------------------------------------
-- Friendica 2023.09-dev (Giant Rhubarb)
-- DB_UPDATE_VERSION 1521
-- DB_UPDATE_VERSION 1522
-- ------------------------------------------
@ -1994,6 +1994,7 @@ CREATE VIEW `post-user-view` AS SELECT
`causer`.`addr` AS `causer-addr`,
`causer`.`name` AS `causer-name`,
`causer`.`nick` AS `causer-nick`,
`causer`.`alias` AS `causer-alias`,
`causer`.`thumb` AS `causer-avatar`,
`causer`.`network` AS `causer-network`,
`causer`.`blocked` AS `causer-blocked`,
@ -2173,6 +2174,7 @@ CREATE VIEW `post-thread-user-view` AS SELECT
`causer`.`addr` AS `causer-addr`,
`causer`.`name` AS `causer-name`,
`causer`.`nick` AS `causer-nick`,
`causer`.`alias` AS `causer-alias`,
`causer`.`thumb` AS `causer-avatar`,
`causer`.`network` AS `causer-network`,
`causer`.`blocked` AS `causer-blocked`,
@ -2338,6 +2340,7 @@ CREATE VIEW `post-view` AS SELECT
`causer`.`addr` AS `causer-addr`,
`causer`.`name` AS `causer-name`,
`causer`.`nick` AS `causer-nick`,
`causer`.`alias` AS `causer-alias`,
`causer`.`thumb` AS `causer-avatar`,
`causer`.`network` AS `causer-network`,
`causer`.`blocked` AS `causer-blocked`,
@ -2480,6 +2483,7 @@ CREATE VIEW `post-thread-view` AS SELECT
`causer`.`addr` AS `causer-addr`,
`causer`.`name` AS `causer-name`,
`causer`.`nick` AS `causer-nick`,
`causer`.`alias` AS `causer-alias`,
`causer`.`thumb` AS `causer-avatar`,
`causer`.`network` AS `causer-network`,
`causer`.`blocked` AS `causer-blocked`,

2
src/Model/Contact.php
View file

@ -2811,7 +2811,7 @@ class Contact
}
$update = false;
$guid = ($ret['guid'] ?? '') ?: Item::guidFromUri($ret['url'], $ret['baseurl'] ?? $ret['alias']);
$guid = ($ret['guid'] ?? '') ?: Item::guidFromUri($ret['url'], $ret['baseurl'] ?? $ret['alias'] ?? '');
// make sure to not overwrite existing values with blank entries except some technical fields
$keep = ['batch', 'notify', 'poll', 'request', 'confirm', 'poco', 'baseurl'];

4
src/Model/Item.php
View file

@ -95,8 +95,8 @@ class Item
'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object',
'quote-uri', 'quote-uri-id', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'mention', 'global',
'author-id', 'author-link', 'author-alias', 'author-name', 'author-avatar', 'author-network', 'author-updated', 'author-gsid', 'author-addr', 'author-uri-id',
'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'owner-network', 'owner-contact-type', 'owner-updated',
'causer-id', 'causer-link', 'causer-name', 'causer-avatar', 'causer-contact-type', 'causer-network',
'owner-id', 'owner-link', 'owner-alias', 'owner-name', 'owner-avatar', 'owner-network', 'owner-contact-type', 'owner-updated',
'causer-id', 'causer-link', 'causer-alias', 'causer-name', 'causer-avatar', 'causer-contact-type', 'causer-network',
'contact-id', 'contact-uid', 'contact-link', 'contact-name', 'contact-avatar',
'writable', 'self', 'cid', 'alias',
'event-created', 'event-edited', 'event-start', 'event-finish',

2
static/dbstructure.config.php
View file

@ -56,7 +56,7 @@ use Friendica\Database\DBA;
// This file is required several times during the test in DbaDefinition which justifies this condition
if (!defined('DB_UPDATE_VERSION')) {
define('DB_UPDATE_VERSION', 1521);
define('DB_UPDATE_VERSION', 1522);
}
return [

4
static/dbview.config.php
View file

@ -175,6 +175,7 @@
"causer-addr" => ["causer", "addr"],
"causer-name" => ["causer", "name"],
"causer-nick" => ["causer", "nick"],
"causer-alias" => ["causer", "alias"],
"causer-avatar" => ["causer", "thumb"],
"causer-network" => ["causer", "network"],
"causer-blocked" => ["causer", "blocked"],
@ -352,6 +353,7 @@
"causer-addr" => ["causer", "addr"],
"causer-name" => ["causer", "name"],
"causer-nick" => ["causer", "nick"],
"causer-alias" => ["causer", "alias"],
"causer-avatar" => ["causer", "thumb"],
"causer-network" => ["causer", "network"],
"causer-blocked" => ["causer", "blocked"],
@ -515,6 +517,7 @@
"causer-addr" => ["causer", "addr"],
"causer-name" => ["causer", "name"],
"causer-nick" => ["causer", "nick"],
"causer-alias" => ["causer", "alias"],
"causer-avatar" => ["causer", "thumb"],
"causer-network" => ["causer", "network"],
"causer-blocked" => ["causer", "blocked"],
@ -655,6 +658,7 @@
"causer-addr" => ["causer", "addr"],
"causer-name" => ["causer", "name"],
"causer-nick" => ["causer", "nick"],
"causer-alias" => ["causer", "alias"],
"causer-avatar" => ["causer", "thumb"],
"causer-network" => ["causer", "network"],
"causer-blocked" => ["causer", "blocked"],