Merge branch 'develop' of https://github.com/friendica/friendica into develop

[friendica.git] / update.php

diff --git a/update.php b/update.php
index 47434b3373a4480900df5fe6b32807988cb68d81..6a0ed1af205af8312297bc9f0c2ed06495f143e7 100644 (file)
--- a/update.php
+++ b/update.php
@@ -20,7 +20,7 @@ require_once 'include/dba.php';
  * This function is responsible for doing post update changes to the data
  * (not the structure) in the database.
  *
- * Database structure changes are done in src/Database/DBStructure.php
+ * Database structure changes are done in config/dbstructure.php
  *
  * If there is a need for a post process to a structure change, update this file
  * by adding a new function at the end with the number of the new DB_UPDATE_VERSION.
@@ -31,8 +31,8 @@ require_once 'include/dba.php';
  * You are currently on version 4711 and you are preparing changes that demand an update script.
  *
  * 1. Create a function "update_4712()" here in the update.php
- * 2. Apply the needed structural changes in src/Database/DBStructure.php
- * 3. Set DB_UPDATE_VERSION in boot.php to 4712.
+ * 2. Apply the needed structural changes in config/dbStructure.php
+ * 3. Set DB_UPDATE_VERSION in config/dbstructure.php to 4712.
  *
  * If you need to run a script before the database update, name the function "pre_update_4712()"
  */
@@ -149,7 +149,7 @@ function update_1191() {
 
 function update_1203() {
        $r = q("UPDATE `user` SET `account-type` = %d WHERE `page-flags` IN (%d, %d)",
-               DBA::escape(ACCOUNT_TYPE_COMMUNITY), DBA::escape(PAGE_COMMUNITY), DBA::escape(PAGE_PRVGROUP));
+               DBA::escape(Contact::ACCOUNT_TYPE_COMMUNITY), DBA::escape(Contact::PAGE_COMMUNITY), DBA::escape(Contact::PAGE_PRVGROUP));
 }
 
 function update_1244() {
@@ -247,14 +247,11 @@ function update_1278() {
        return UPDATE_SUCCESS;
 }
 
-function update_1278() {
-       Config::set('system', 'maintenance', 1);
-       Config::set('system', 'maintenance_reason', L10n::t('%s: Updating post-type.', DBM::date().' '.date('e')));
-
-       Item::update(['post-type' => Item::PT_PAGE], ['bookmark' => true]);
-       Item::update(['post-type' => Item::PT_PERSONAL_NOTE], ['type' => 'note']);
+function update_1288() {
+       // Updates missing `uri-id` values
 
-       Config::set('system', 'maintenance', 0);
+       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;
 }