Move Global Functions - Part 3

[friendica.git] / update.php

diff --git a/update.php b/update.php
index e7543728d2f6d25178a02a9103a2847fd5b641fe..d889e241e22061f56b549857a82995ce023c8957 100644 (file)
--- a/update.php
+++ b/update.php
@@ -6,7 +6,6 @@ use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\User;
@@ -50,10 +49,10 @@ function update_1178() {
                $profile["pub_keywords"] = profile_clean_keywords($profile["pub_keywords"]);
 
                $r = q("UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `self` AND `uid` = %d",
-                               dbesc($profile["about"]),
-                               dbesc($profile["locality"]),
-                               dbesc($profile["pub_keywords"]),
-                               dbesc($profile["gender"]),
+                               DBA::escape($profile["about"]),
+                               DBA::escape($profile["locality"]),
+                               DBA::escape($profile["pub_keywords"]),
+                               DBA::escape($profile["gender"]),
                                intval($profile["uid"])
                        );
        }
@@ -113,11 +112,11 @@ function update_1191() {
 
        // select old formlist addon entries
        $r = q("SELECT `uid`, `cat`, `k`, `v` FROM `pconfig` WHERE `cat` = '%s' ",
-               dbesc('forumlist')
+               DBA::escape('forumlist')
        );
 
        // convert old forumlist addon entries in new config entries
-       if (DBM::is_result($r)) {
+       if (DBA::isResult($r)) {
                foreach ($r as $rr) {
                        $uid = $rr['uid'];
                        $family = $rr['cat'];
@@ -150,7 +149,7 @@ function update_1191() {
 
 function update_1203() {
        $r = q("UPDATE `user` SET `account-type` = %d WHERE `page-flags` IN (%d, %d)",
-               dbesc(ACCOUNT_TYPE_COMMUNITY), dbesc(PAGE_COMMUNITY), dbesc(PAGE_PRVGROUP));
+               DBA::escape(Contact::ACCOUNT_TYPE_COMMUNITY), DBA::escape(Contact::PAGE_COMMUNITY), DBA::escape(Contact::PAGE_PRVGROUP));
 }
 
 function update_1244() {
@@ -247,3 +246,12 @@ function update_1278() {
 
        return UPDATE_SUCCESS;
 }
+
+function update_1288() {
+       // 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-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;
+}