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

wrong permalink on remote events

Browse Source
This commit is contained in:
friendica 2014-10-23 01:36:01 -07:00
parent 58c692e389
commit 0ebfee8f87
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/event.php
View File

@ -400,8 +400,7 @@ function event_store_item($arr,$event) {
}
else {
$z = q("select * from channel where channel_hash = '%s' and channel_id = %d limit 1",
dbesc($event['event_xchan']),
$z = q("select * from channel where channel_id = %d limit 1",
intval($arr['uid'])
);
@ -413,7 +412,7 @@ function event_store_item($arr,$event) {
$item_arr['id'] = $item['id'];
}
else {
$wall = (($z) ? true : false);
$wall = (($z[0]['channel_hash'] == $event['event_xchan']) ? true : false);
$item_flags = ITEM_THREAD_TOP;
if($wall) {
@ -455,7 +454,14 @@ function event_store_item($arr,$event) {
$item_arr['body'] = $prefix . format_event_bbcode($arr);
$item_arr['plink'] = z_root() . '/channel/' . $z[0]['channel_address'] . '/?f=&mid=' . $item_arr['mid'];
// if it's local send the permalink to the channel page.
// otherwise we'll fallback to /display/$message_id
if($wall)
$item_arr['plink'] = z_root() . '/channel/' . $z[0]['channel_address'] . '/?f=&mid=' . $item_arr['mid'];
else
$item_arr['plink'] = z_root() . '/display/' . $item_arr['mid'];
$x = q("select * from xchan where xchan_hash = '%s' limit 1",
dbesc($arr['event_xchan'])

2
version.inc
View File

@ -1 +1 @@
2014-10-22.836
2014-10-23.837