diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-04-27 09:54:36 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-04-27 09:54:36 +0200 |
| commit | 2e9738e20458c6bd1fa1b71f32896c09accd486d (patch) | |
| tree | f9cad3c58e5c2851ce9e4e32a0a0686155d82bde /include/zid.php | |
| parent | 00a95f4b91711cc28c9b170cfdc8ea6626d803a6 (diff) | |
| parent | 7b445a5b39b887135854ba1b9aa6d9867d584ae5 (diff) | |
| download | volse-hubzilla-2e9738e20458c6bd1fa1b71f32896c09accd486d.tar.gz volse-hubzilla-2e9738e20458c6bd1fa1b71f32896c09accd486d.tar.bz2 volse-hubzilla-2e9738e20458c6bd1fa1b71f32896c09accd486d.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/zid.php')
| -rw-r--r-- | include/zid.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/zid.php b/include/zid.php index 5275c6d5a..fe06948ba 100644 --- a/include/zid.php +++ b/include/zid.php @@ -60,7 +60,7 @@ function zid($s, $address = '') { $url_match = true; if ($mine && $myaddr && (! $url_match)) - $zurl = $s . (($num_slashes >= 3) ? '' : '/') . $achar . 'zid=' . urlencode($myaddr); + $zurl = $s . (($num_slashes >= 3) ? '' : '/') . (($achar === '?') ? '?f=&' : '&') . 'zid=' . urlencode($myaddr); else $zurl = $s; @@ -103,6 +103,10 @@ function strip_zats($s) { return preg_replace('/[\?&]zat=(.*?)(&|$)/ism','$2',$s); } +function strip_escaped_zids($s) { + $x = preg_replace('/&\;zid=(.*?)(&|$)/ism','$2',$s); + return strip_query_param($x,'f'); +} function clean_query_string($s = '') { |