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

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Browse Source
This commit is contained in:
zotlabs
2018-04-23 18:15:18 -07:00
parent 97308ad2fb 2dff10564c
commit 59ac3d04eb
17 changed files with 5334 additions and 4723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Ping.php
View File

@@ -143,7 +143,7 @@ class Ping extends \Zotlabs\Web\Controller {
$sql_extra = '';
if(! ($vnotify & VNOTIFY_LIKE))
$sql_extra = ' AND verb NOT IN ("' . dbesc(ACTIVITY_LIKE) . '", "' . dbesc(ACTIVITY_DISLIKE) . '") ';
$sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_LIKE) . "', '" . dbesc(ACTIVITY_DISLIKE) . "') ";
$discover_tab_on = can_view_public_stream();