Solved warnings

using php code sniffer
This commit is contained in:
Jeroen De Meerleer 2018-12-21 10:42:24 +01:00 committed by Hypolite Petovan
parent e157859dfb
commit c101b0cf08
1 changed files with 33 additions and 7 deletions

View File

@ -51,7 +51,8 @@ function update_1178()
$profile["pub_keywords"] = profile_clean_keywords($profile["pub_keywords"]); $profile["pub_keywords"] = profile_clean_keywords($profile["pub_keywords"]);
$r = q( $r = q(
"UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `self` AND `uid` = %d", "UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s'
WHERE `self` AND `uid` = %d",
DBA::escape($profile["about"]), DBA::escape($profile["about"]),
DBA::escape($profile["locality"]), DBA::escape($profile["locality"]),
DBA::escape($profile["pub_keywords"]), DBA::escape($profile["pub_keywords"]),
@ -212,7 +213,14 @@ WHERE `hook` LIKE 'plugin_%'");
function update_1260() function update_1260()
{ {
Config::set('system', 'maintenance', 1); Config::set('system', 'maintenance', 1);
Config::set('system', 'maintenance_reason', L10n::t('%s: Updating author-id and owner-id in item and thread table. ', DateTimeFormat::utcNow().' '.date('e'))); Config::set(
'system',
'maintenance_reason',
L10n::t(
'%s: Updating author-id and owner-id in item and thread table. ',
DateTimeFormat::utcNow().' '.date('e')
)
);
$items = DBA::p("SELECT `id`, `owner-link`, `owner-name`, `owner-avatar`, `network` FROM `item` $items = DBA::p("SELECT `id`, `owner-link`, `owner-name`, `owner-avatar`, `network` FROM `item`
WHERE `owner-id` = 0 AND `owner-link` != ''"); WHERE `owner-id` = 0 AND `owner-link` != ''");
@ -253,14 +261,25 @@ function update_1260()
function update_1261() function update_1261()
{ {
// This fixes the results of an issue in the develop branch of 2018-05. // This fixes the results of an issue in the develop branch of 2018-05.
DBA::update('contact', ['blocked' => false, 'pending' => false], ['uid' => 0, 'blocked' => true, 'pending' => true]); DBA::update(
'contact',
['blocked' => false, 'pending' => false],
['uid' => 0, 'blocked' => true, 'pending' => true]
);
return Update::SUCCESS; return Update::SUCCESS;
} }
function update_1278() function update_1278()
{ {
Config::set('system', 'maintenance', 1); Config::set('system', 'maintenance', 1);
Config::set('system', 'maintenance_reason', L10n::t('%s: Updating post-type.', DateTimeFormat::utcNow().' '.date('e'))); Config::set(
'system',
'maintenance_reason',
L10n::t(
'%s: Updating post-type.',
DateTimeFormat::utcNow().' '.date('e')
)
);
Item::update(['post-type' => Item::PT_PAGE], ['bookmark' => true]); Item::update(['post-type' => Item::PT_PAGE], ['bookmark' => true]);
Item::update(['post-type' => Item::PT_PERSONAL_NOTE], ['type' => 'note']); Item::update(['post-type' => Item::PT_PERSONAL_NOTE], ['type' => 'note']);
@ -274,8 +293,14 @@ function update_1288()
{ {
// Updates missing `uri-id` values // Updates missing `uri-id` values
DBA::e("UPDATE `item-activity` INNER JOIN `item` ON `item`.`iaid` = `item-activity`.`id` SET `item-activity`.`uri-id` = `item`.`uri-id` WHERE `item-activity`.`uri-id` IS NULL OR `item-activity`.`uri-id` = 0"); DBA::e("UPDATE `item-activity`
DBA::e("UPDATE `item-content` INNER JOIN `item` ON `item`.`icid` = `item-content`.`id` SET `item-content`.`uri-id` = `item`.`uri-id` WHERE `item-content`.`uri-id` IS NULL OR `item-content`.`uri-id` = 0"); INNER JOIN `item` ON `item`.`iaid` = `item-activity`.`id`
SET `item-activity`.`uri-id` = `item`.`uri-id`
WHERE `item-activity`.`uri-id` IS NULL OR `item-activity`.`uri-id` = 0");
DBA::e("UPDATE `item-content`
INNER JOIN `item` ON `item`.`icid` = `item-content`.`id`
SET `item-content`.`uri-id` = `item`.`uri-id`
WHERE `item-content`.`uri-id` IS NULL OR `item-content`.`uri-id` = 0");
return Update::SUCCESS; return Update::SUCCESS;
} }
@ -318,7 +343,8 @@ function update_1293()
$fail++; $fail++;
} else { } else {
DBA::update('contact', ['gender' => $key], ['id' => $gender['id']]); DBA::update('contact', ['gender' => $key], ['id' => $gender['id']]);
logger::log('Updated contact ' . $gender['id'] . ' to gender ' . $key . ' (was: ' . $gender['gender'] . ')'); logger::log('Updated contact ' . $gender['id'] . ' to gender ' . $key .
' (was: ' . $gender['gender'] . ')');
$success++; $success++;
} }
} }