harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jeroenpraat 2015-11-20 00:40:32 +01:00
commit e537d53389
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boot.php
View File

@ -83,6 +83,7 @@ $DIRECTORY_FALLBACK_SERVERS = array(
'https://hubzilla.site', 'https://hubzilla.site',
'https://red.zottel.red', 'https://red.zottel.red',
'https://gravizot.de', 'https://gravizot.de',
'https://blablanet.com',
'https://my.federated.social' 'https://my.federated.social'
); );

12
mod/subthread.php
View File

@ -11,18 +11,24 @@ function subthread_content(&$a) {
return; return;
} }
$item_id = ((argc() > 2) ? notags(trim(argv(2))) : 0);
if(argv(1) === 'sub') if(argv(1) === 'sub')
$activity = ACTIVITY_FOLLOW; $activity = ACTIVITY_FOLLOW;
elseif(argv(1) === 'unsub') elseif(argv(1) === 'unsub')
$activity = ACTIVITY_UNFOLLOW; $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", $r = q("SELECT parent FROM item WHERE id = '%s'",
dbesc($item_id),
dbesc($item_id) 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)) { if((! $item_id) || (! $r)) {
logger('subthread: no item ' . $item_id); logger('subthread: no item ' . $item_id);
return; return;

2
version.inc
View File

@ -1 +1 @@
2015-11-18.1221 2015-11-19.1221