diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-04-05 10:44:00 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-04-05 10:44:00 +0200 |
| commit | dcacdd23c87061dc15bd12ed2e959bcbe020c5df (patch) | |
| tree | e7dcd63bbfdaa6ae564c60d59ef60edf0e6ba7a7 /Zotlabs | |
| parent | bd0959b5a431ceaab694f0236a790116a5e8d556 (diff) | |
| parent | fe401203bd33fdb19880420556c8a6b6a371f94e (diff) | |
| download | volse-hubzilla-dcacdd23c87061dc15bd12ed2e959bcbe020c5df.tar.gz volse-hubzilla-dcacdd23c87061dc15bd12ed2e959bcbe020c5df.tar.bz2 volse-hubzilla-dcacdd23c87061dc15bd12ed2e959bcbe020c5df.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Item.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Like.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index fba2ef7a4..ad72d9ccd 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -542,7 +542,7 @@ class Item extends \Zotlabs\Web\Controller { // Look for tags and linkify them $results = linkify_tags($a, $body, ($uid) ? $uid : $profile_uid); - + if($results) { // Set permissions based on tag replacements diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php index 6d9fde17c..12de86e72 100644 --- a/Zotlabs/Module/Like.php +++ b/Zotlabs/Module/Like.php @@ -296,10 +296,11 @@ class Like extends \Zotlabs\Web\Controller { notice( t('Permission denied') . EOL); killme(); } - + $r = q("select * from xchan where xchan_hash = '%s' limit 1", dbesc($item['owner_xchan']) ); + if($r) $thread_owner = $r[0]; else |