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

check mentions against the appropriate xchan_url and not a hard-coded /channel/ string

Browse Source
This commit is contained in:
friendica 2015-01-13 20:54:27 -08:00
parent a93f2b1b8f
commit 7090b58f68
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/items.php
View File

@ -2673,7 +2673,7 @@ function tag_deliver($uid,$item_id) {
* Fetch stuff we need - a channel and an item * Fetch stuff we need - a channel and an item
*/ */
$u = q("select * from channel where channel_id = %d limit 1", $u = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1",
intval($uid) intval($uid)
); );
if(! $u) if(! $u)
@ -2811,7 +2811,7 @@ function tag_deliver($uid,$item_id) {
if($terms) if($terms)
logger('tag_deliver: post mentions: ' . print_r($terms,true), LOGGER_DATA); logger('tag_deliver: post mentions: ' . print_r($terms,true), LOGGER_DATA);
$link = normalise_link($a->get_baseurl() . '/channel/' . $u[0]['channel_address']); $link = normalise_link($u[0]['xchan_url']);
if($terms) { if($terms) {
foreach($terms as $term) { foreach($terms as $term) {
@ -2952,7 +2952,7 @@ function tgroup_check($uid,$item) {
if(! perm_is_allowed($uid,$item['author_xchan'],'tag_deliver')) if(! perm_is_allowed($uid,$item['author_xchan'],'tag_deliver'))
return false; return false;
$u = q("select * from channel where channel_id = %d limit 1", $u = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1",
intval($uid) intval($uid)
); );
@ -2964,7 +2964,7 @@ function tgroup_check($uid,$item) {
if($terms) if($terms)
logger('tgroup_check: post mentions: ' . print_r($terms,true), LOGGER_DATA); logger('tgroup_check: post mentions: ' . print_r($terms,true), LOGGER_DATA);
$link = normalise_link($a->get_baseurl() . '/channel/' . $u[0]['channel_address']); $link = normalise_link($u[0]['xchan_url']);
if($terms) { if($terms) {
foreach($terms as $term) { foreach($terms as $term) {