diff options
author | Max Kostikov <max@kostikov.co> | 2018-12-20 20:51:26 +0100 |
---|---|---|
committer | Max Kostikov <max@kostikov.co> | 2018-12-20 20:51:26 +0100 |
commit | 89e734dcca1525fa804343d6ecf5286ce70b05ba (patch) | |
tree | 10d0a3614e9f97f5065ea53fff1c3d5fcd292c16 /Zotlabs/Module/Channel.php | |
parent | 3a662555768840d18c6dbba027af644eda54f20e (diff) | |
parent | 090fe394e4733aea9e9ca2e9a93c2c27b266d065 (diff) | |
download | volse-hubzilla-89e734dcca1525fa804343d6ecf5286ce70b05ba.tar.gz volse-hubzilla-89e734dcca1525fa804343d6ecf5286ce70b05ba.tar.bz2 volse-hubzilla-89e734dcca1525fa804343d6ecf5286ce70b05ba.zip |
Merge branch 'dev' into 'dev'
Sync dev
See merge request kostikov/core!1
Diffstat (limited to 'Zotlabs/Module/Channel.php')
-rw-r--r-- | Zotlabs/Module/Channel.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index 12d87885f..5fdefd805 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -124,6 +124,11 @@ class Channel extends Controller { $mid = ((x($_REQUEST,'mid')) ? $_REQUEST['mid'] : ''); + if(strpos($mid,'b64.') === 0) + $decoded = @base64url_decode(substr($mid,4)); + if($decoded) + $mid = $decoded; + $datequery = ((x($_GET,'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : ''); $datequery2 = ((x($_GET,'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : ''); @@ -375,6 +380,9 @@ class Channel extends Controller { if((! $update) && (! $load)) { + if($decoded) + $mid = 'b64.' . base64url_encode($mid); + // This is ugly, but we can't pass the profile_uid through the session to the ajax updater, // because browser prefetching might change it on us. We have to deliver it with the page. |