Bugfix: When fetching a feed's name, take the title or description, but not the autho...

[friendica.git] / update.php

diff --git a/update.php b/update.php
index a9cca27d91117ce862ab19e51f71cfe16e6514e1..9303e5d19cdba01a51fb4a287d4fd13ed7de4705 100644 (file)
--- a/update.php
+++ b/update.php
@@ -10,26 +10,25 @@ define( 'UPDATE_VERSION' , 1170 );
  * copying the latest files from the source code repository will always perform a clean
  * and painless upgrade.
  *
- * Each function in this file is named update_nnnn() where nnnn is an increasing number 
+ * Each function in this file is named update_nnnn() where nnnn is an increasing number
  * which began counting at 1000.
- * 
+ *
  * At the top of the file "boot.php" is a define for DB_UPDATE_VERSION. Any time there is a change
  * to the database schema or one which requires an upgrade path from the existing application,
  * the DB_UPDATE_VERSION and the UPDATE_VERSION at the top of this file are incremented.
  *
  * The current DB_UPDATE_VERSION is stored in the config area of the database. If the application starts up
- * and DB_UPDATE_VERSION is greater than the last stored build number, we will process every update function 
- * in order from the currently stored value to the new DB_UPDATE_VERSION. This is expected to bring the system 
+ * and DB_UPDATE_VERSION is greater than the last stored build number, we will process every update function
+ * in order from the currently stored value to the new DB_UPDATE_VERSION. This is expected to bring the system
  * up to current without requiring re-installation or manual intervention.
  *
  * Once the upgrade functions have completed, the current DB_UPDATE_VERSION is stored as the current value.
- * The DB_UPDATE_VERSION will always be one greater than the last numbered script in this file. 
+ * The DB_UPDATE_VERSION will always be one greater than the last numbered script in this file.
  *
  * If you change the database schema, the following are required:
- *    1. Update the file database.sql to match the new schema.
- *    2. Update this file by adding a new function at the end with the number of the current DB_UPDATE_VERSION.
- *       This function should modify the current database schema and perform any other steps necessary
- *       to ensure that upgrade is silent and free from requiring interaction.
+ *    1. Update the file include/dbstructure.php to match the new schema.
+ *    2. If there is a need for a post procession, update this file by adding a new function at the end with the number of the current DB_UPDATE_VERSION.
+ *       This function should perform some post procession steps but no database updates.
  *    3. Increment the DB_UPDATE_VERSION in boot.php *AND* the UPDATE_VERSION in this file to match it
  *    4. TEST the upgrade prior to checkin and filing a pull request.
  *
@@ -1562,7 +1561,7 @@ function update_1169() {
        $r = q("CREATE TABLE IF NOT EXISTS `thread` (
                  `iid` int(10) unsigned NOT NULL DEFAULT '0',
                  `uid` int(10) unsigned NOT NULL DEFAULT '0',
-                 `contact-id` int(10) unsigned NOT NULL DEFAULT '0',
+                 `contact-id` int(11) unsigned NOT NULL DEFAULT '0',
                  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
                  `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
                  `commented` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -1583,17 +1582,15 @@ function update_1169() {
                  `mention` tinyint(1) NOT NULL DEFAULT '0',
                  `network` char(32) NOT NULL,
                  PRIMARY KEY (`iid`),
-                 KEY `uid` (`uid`),
-                 KEY `contact-id` (`contact-id`),
                  KEY `created` (`created`),
-                 KEY `edited` (`edited`),
                  KEY `commented` (`commented`),
-                 KEY `received` (`received`),
-                 KEY `changed` (`changed`),
-                 KEY `network` (`network`)
-                 KEY `visible_deleted_moderated_private_wall_received` (`visible`,`deleted`,`moderated`,`private`,`wall`,`received`),
-                 KEY `uid_visible_deleted_moderated_created` (`uid`,`visible`,`deleted`,`moderated`,`created`),
-                 KEY `uid_visible_deleted_moderated_commented` (`uid`,`visible`,`deleted`,`moderated`,`commented`)
+                 KEY `uid_network_commented` (`uid`,`network`,`commented`),
+                 KEY `uid_network_created` (`uid`,`network`,`created`),
+                 KEY `uid_contactid_commented` (`uid`,`contact-id`,`commented`),
+                 KEY `uid_contactid_created` (`uid`,`contact-id`,`created`),
+                 KEY `wall_private_received` (`wall`,`private`,`received`),
+                 KEY `uid_created` (`uid`,`created`),
+                 KEY `uid_commented` (`uid`,`commented`)
                ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;");
        if (!$r)
                return UPDATE_FAILED;