Merge remote-tracking branch 'upstream/master'

Conflicts:
	boot.php
	update.php

diff --cc boot.php
index 1819817871452e7d42ea2d6d730d47ac3aab6aae,f592b4c27c5ef8145a197161c2395d9ba59ec8bc..c72f8c8bf5decea223f68d453011d1dec49f8f75
--- 1/boot.php
--- 2/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 include/dbstructure.php
Simple merge

diff --cc update.php
index ada6edbb37ba17c4c277b2eec2e14a52f3b66fe6,f8c99135beea65826488a5567f3a5314d9018a07..78b66fe006f87df611af4ffb78e8f38cb8aed91d
--- 1/update.php
--- 2/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.
++*/