oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-11 01:24:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/develop' into 1601-dfrn

Browse source
This commit is contained in:
Michael Vogel 2016-01-25 23:51:11 +01:00
commit 4208acf4b6
10 changed files with 360 additions and 325 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/cron.php
View file

@ -430,7 +430,6 @@ function cron_repair_database() {
q("UPDATE `item` INNER JOIN `item` AS `parent` ON `parent`.`uri` = `item`.`parent-uri` AND `parent`.`uid` = `item`.`uid` SET `item`.`parent` = `parent`.`id` WHERE `item`.`parent` = 0");
/// @todo
/// - remove duplicated contacts with uid=0 (We could do this at the place where the contacts are stored)
/// - remove thread entries without item
/// - remove sign entries without item
/// - remove children when parent got lost