From: Michael Vogel <icarus@dabo.de>
Date: Thu, 4 Sep 2014 00:29:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=24b3befc4d6754d57ae94abe4122b4977f14ff0f;p=friendica.git

Merge remote-tracking branch 'upstream/master'

Conflicts:
	boot.php
	update.php
---

24b3befc4d6754d57ae94abe4122b4977f14ff0f
diff --cc boot.php
index 1819817871,f592b4c27c..c72f8c8bf5
--- a/boot.php
+++ b/boot.php
@@@ -14,7 -14,7 +14,7 @@@ require_once('include/features.php')
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
  define ( 'FRIENDICA_VERSION',      '3.2.1753' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
- define ( 'DB_UPDATE_VERSION',      1171      );
 -define ( 'DB_UPDATE_VERSION',      1172      );
++define ( 'DB_UPDATE_VERSION',      1173      );
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
  
diff --cc update.php
index ada6edbb37,f8c99135be..78b66fe006
--- a/update.php
+++ b/update.php
@@@ -1,6 -1,6 +1,6 @@@
  <?php
  
- define( 'UPDATE_VERSION' , 1171 );
 -define( 'UPDATE_VERSION' , 1172 );
++define( 'UPDATE_VERSION' , 1173 );
  
  /**
   *
@@@ -32,6 -32,6 +32,8 @@@
   *    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.
   *
++ * IMPORTANT!
++ * NEVER do a database change anymore in the update functions! Only do this in the file include/dbstructure.php!
   */
  
  
@@@ -1599,3 -1599,18 +1601,27 @@@ function update_1169() 
  
  	return UPDATE_SUCCESS;
  }
+ 
+ function update_1170() {
+ 	$r = q("ALTER TABLE `guid` CHANGE `guid` `guid` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL");
+ 	if (!$r)
+ 		return UPDATE_FAILED;
+ 	return UPDATE_SUCCESS;
+ }
+ 
+ function update_1171() {
+ 	$r = q("ALTER TABLE `item` CHANGE `guid` `guid` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL");
+ 	if (!$r)
+ 		return UPDATE_FAILED;
+ 	return UPDATE_SUCCESS;
+ }
+ 
++/*
++==========
++ATTENTION!
++==========
++
++All following update functions are ONLY for jobs that need to run AFTER the database changes are applied.
++
++Database changes are ONLY applied in the file include/dbstructure.php.
++*/