friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Updated towards Michael Suggestions 

They were just warnings anyway
This commit is contained in:
Jeroen De Meerleer 2018-12-21 11:30:13 +01:00 committed by Hypolite Petovan
parent c101b0cf08
commit 82a7611488
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
update.php
View File

@ -51,8 +51,7 @@ 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' "UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `self` AND `uid` = %d",
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"]),
@ -261,11 +260,7 @@ 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( DBA::update('contact', ['blocked' => false, 'pending' => false], ['uid' => 0, 'blocked' => true, 'pending' => true]);
'contact',
['blocked' => false, 'pending' => false],
['uid' => 0, 'blocked' => true, 'pending' => true]
);
return Update::SUCCESS; return Update::SUCCESS;
} }
@ -293,14 +288,8 @@ function update_1288()
{ {
// Updates missing `uri-id` values // Updates missing `uri-id` values
DBA::e("UPDATE `item-activity` 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");
INNER JOIN `item` ON `item`.`iaid` = `item-activity`.`id` 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");
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;
} }