Merge https://github.com/friendica/friendica into pull

diff --git a/boot.php b/boot.php
index 3d33502ddbd2c6c2605c7cd98c45229198bdddd0..f592b4c27c5ef8145a197161c2395d9ba59ec8bc 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -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 ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
 

diff --git a/database.sql b/database.sql
index 0d45dda106c4e6fe92c6e66a796b70a04fcb99b7..cbf8933f3d24d4f9fa82014860b8bbd12e3bf5c0 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -507,7 +507,7 @@ CREATE TABLE IF NOT EXISTS `intro` (
 
 CREATE TABLE IF NOT EXISTS `item` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `guid` char(64) NOT NULL,
+  `guid` char(255) NOT NULL,
   `uri` char(255) CHARACTER SET ascii NOT NULL,
   `uid` int(10) unsigned NOT NULL DEFAULT '0',
   `contact-id` int(10) unsigned NOT NULL DEFAULT '0',

diff --git a/update.php b/update.php
index d0fddcf27616d0540e9d09914f638b0394b44329..f8c99135beea65826488a5567f3a5314d9018a07 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1171 );
+define( 'UPDATE_VERSION' , 1172 );
 
 /**
  *
@@ -1606,3 +1606,11 @@ function update_1170() {
                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;
+}
+