Merge branch 'master' of https://github.com/redmatrix/hubzilla

3 files changed, 11 insertions, 4 deletions

diff --git a/boot.php b/boot.php
index 390560592..c74eea512 100755
--- a/boot.php
+++ b/boot.php
@@ -83,6 +83,7 @@ $DIRECTORY_FALLBACK_SERVERS = array(
 	'https://hubzilla.site',
 	'https://red.zottel.red',
 	'https://gravizot.de',
+	'https://blablanet.com',
 	'https://my.federated.social'
 );
 
diff --git a/mod/subthread.php b/mod/subthread.php
index 162545a2f..74d742b6a 100755
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -11,18 +11,24 @@ function subthread_content(&$a) {
 		return;
 	}
 
+	$item_id = ((argc() > 2) ? notags(trim(argv(2))) : 0);
+
 	if(argv(1) === 'sub')
 		$activity = ACTIVITY_FOLLOW;
 	elseif(argv(1) === 'unsub')
 		$activity = ACTIVITY_UNFOLLOW;
 
-	$item_id = ((argc() > 2) ? notags(trim(argv(2))) : 0);
 
-	$r = q("SELECT * FROM `item` WHERE `parent` = '%s' OR `parent_mid` = '%s' and parent = id LIMIT 1",
-		dbesc($item_id),
+	$r = q("SELECT parent FROM item WHERE id = '%s'",
 		dbesc($item_id)
 	);
 
+	if($r) {
+		$r = q("select * from item where id = parent and id = %d limit 1",
+			dbesc($r[0]['parent'])
+		);
+	}
+
 	if((! $item_id) || (! $r)) {
 		logger('subthread: no item ' . $item_id);
 		return;
diff --git a/version.inc b/version.inc
index 369ed3cb7..d6100d73a 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-11-18.1221
+2015-11-19.1221