From: Domovoy <domovoy@errlock.org>
Date: Fri, 3 Aug 2012 16:57:37 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=66848b04717528bca009b9f5c33291bb593e9033;p=friendica.git

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

Conflicts:
	update.php
---

66848b04717528bca009b9f5c33291bb593e9033
diff --cc boot.php
index e0b768171a,f7d38c2551..170c9953b9
--- a/boot.php
+++ b/boot.php
@@@ -11,9 -11,9 +11,9 @@@ require_once('include/cache.php')
  require_once('library/Mobile_Detect/Mobile_Detect.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
- define ( 'FRIENDICA_VERSION',      '3.0.1419' );
+ define ( 'FRIENDICA_VERSION',      '3.0.1423' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 -define ( 'DB_UPDATE_VERSION',      1154      );
 +define ( 'DB_UPDATE_VERSION',      1155      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
diff --cc update.php
index 789ff9f45d,19e6cf3bdf..c41acf6fbc
--- a/update.php
+++ b/update.php
@@@ -1343,11 -1343,3 +1343,10 @@@ function update_1153() 
  	if(!$r) return UPDATE_FAILED;
  	return UPDATE_SUCCESS;
  }
 +
 +function update_1154() {
 +	$r = q("UPDATE `item` SET `thr-parent`=`parent-uri` WHERE `id`!=`parent` AND `thr-parent`=''");
 +	
 +	if(!$r) return UPDATE_FAILED;
 +	return UPDATE_SUCCESS;
 +}
-