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

fix an issue where some encoded mids were not found in /display allthough they existed

Browse Source
This commit is contained in:
Mario Vavti 2017-09-07 11:28:42 +02:00
parent 607c414634
commit 6143f49042
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Zotlabs/Module/Display.php
View File

@ -134,6 +134,13 @@ class Display extends \Zotlabs\Web\Controller {
$static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 1); $static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 1);
//if the target item is not a post (eg a like) want to address its thread parent
$mid = (($target_item['verb'] == ACTIVITY_POST) ? $item_hash : $target_item['thr_parent']);
//if we got a decoded hash we must encode it again before handing to javascript
if($decoded)
$mid = 'b64.' . base64url_encode($mid);
$o .= '<div id="live-display"></div>' . "\r\n"; $o .= '<div id="live-display"></div>' . "\r\n";
$o .= "<script> var profile_uid = " . ((intval(local_channel())) ? local_channel() : (-1)) $o .= "<script> var profile_uid = " . ((intval(local_channel())) ? local_channel() : (-1))
. "; var netargs = '?f='; var profile_page = " . \App::$pager['page'] . "; </script>\r\n"; . "; var netargs = '?f='; var profile_page = " . \App::$pager['page'] . "; </script>\r\n";
@ -165,8 +172,7 @@ class Display extends \Zotlabs\Web\Controller {
'$dend' => '', '$dend' => '',
'$dbegin' => '', '$dbegin' => '',
'$verb' => '', '$verb' => '',
//if the target item is not a post (eg a like) want to address its thread parent '$mid' => $mid
'$mid' => (($target_item['verb'] == ACTIVITY_POST) ? $item_hash : $target_item['thr_parent'])
)); ));
head_add_link([ head_add_link([
@ -323,6 +329,7 @@ class Display extends \Zotlabs\Web\Controller {
$r = q("SELECT id, item_deleted FROM item WHERE mid = '%s' LIMIT 1", $r = q("SELECT id, item_deleted FROM item WHERE mid = '%s' LIMIT 1",
dbesc($item_hash) dbesc($item_hash)
); );
if($r) { if($r) {
if(intval($r[0]['item_deleted'])) { if(intval($r[0]['item_deleted'])) {
notice( t('Item has been removed.') . EOL ); notice( t('Item has been removed.') . EOL );