diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-12 16:07:20 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-12 16:07:20 -0800 |
| commit | a387868540e931a77e0af9ce706047f40feef021 (patch) | |
| tree | 2d3960d326a2a1ef1b62d4d11b40db90d0263235 /Zotlabs | |
| parent | 1ac35dd04748744b22e6fc3dd254f16f7980bd90 (diff) | |
| parent | 6ea7ef43e0a0a99f81986c8e1fe5955800bfa496 (diff) | |
| download | volse-hubzilla-a387868540e931a77e0af9ce706047f40feef021.tar.gz volse-hubzilla-a387868540e931a77e0af9ce706047f40feef021.tar.bz2 volse-hubzilla-a387868540e931a77e0af9ce706047f40feef021.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/Enotify.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Widget/Wiki_pages.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index d5798e671..697b57b6a 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -802,7 +802,8 @@ class Enotify { 'url' => $item['author']['xchan_url'], 'photo' => $item['author']['xchan_photo_s'], 'when' => relative_date($item['created']), - 'class' => (intval($item['item_unseen']) ? 'notify-unseen' : 'notify-seen'), + 'class' => (intval($item['item_unseen']) ? 'notify-unseen' : 'notify-seen'), + 'b64mid' => ((in_array($item['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) ? 'b64.' . base64url_encode($item['thr_parent']) : 'b64.' . base64url_encode($item['mid'])), 'message' => strip_tags(bbcode($itemem_text)) ); diff --git a/Zotlabs/Widget/Wiki_pages.php b/Zotlabs/Widget/Wiki_pages.php index ac44b8d88..39d4b1717 100644 --- a/Zotlabs/Widget/Wiki_pages.php +++ b/Zotlabs/Widget/Wiki_pages.php @@ -12,7 +12,7 @@ class Wiki_pages { if(! $arr['resource_id']) { $c = channelx_by_nick(argv(1)); - $w = \Zotlabs\Lib\NativeWiki::exists_by_name($c['channel_id'],argv(2)); + $w = \Zotlabs\Lib\NativeWiki::exists_by_name($c['channel_id'],urldecode(argv(2))); $arr = array( 'resource_id' => $w['resource_id'], 'channel_id' => $c['channel_id'], |