friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Remove database update, use fallback solution instead.

This commit is contained in:
Domovoy 2012-08-05 15:08:31 +02:00
parent e247915f48
commit dac88fce56
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -13,7 +13,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1425' ); define ( 'FRIENDICA_VERSION', '3.0.1425' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1155 ); define ( 'DB_UPDATE_VERSION', 1154 );
define ( 'EOL', "<br />\r\n" ); define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );

7
include/conversation.php
View File

@ -1151,7 +1151,12 @@ function get_item_children($arr, $parent) {
foreach($arr as $item) { foreach($arr as $item) {
if($item['id'] != $item['parent']) { if($item['id'] != $item['parent']) {
if(get_config('system','thread_allow')) { if(get_config('system','thread_allow')) {
if($item['thr-parent'] == $parent['uri']) { // Fallback to parent-uri if thr-parent is not set
$thr_parent = $item['thr-parent'];
if($thr_parent == '')
$thr_parent = $item['parent-uri'];
if($thr_parent == $parent['uri']) {
$item['children'] = get_item_children($arr, $item); $item['children'] = get_item_children($arr, $item);
$children[] = $item; $children[] = $item;
} }

9
update.php
View File

@ -1,6 +1,6 @@
<?php <?php
define( 'UPDATE_VERSION' , 1155 ); define( 'UPDATE_VERSION' , 1154 );
/** /**
* *
@ -1343,10 +1343,3 @@ function update_1153() {
if(!$r) return UPDATE_FAILED; if(!$r) return UPDATE_FAILED;
return UPDATE_SUCCESS; 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;
}