GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

throw new, not just throw

This commit is contained in:
Mikael Nordfeldth 2016-02-21 19:01:37 +01:00
parent 0c17c32267
commit 893d117309
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/util.php
View File

@ -1391,6 +1391,7 @@ function common_path($relative, $ssl=false, $addSession=true)
return $proto.'://'.$serverpart.'/'.$pathpart.$relative; return $proto.'://'.$serverpart.'/'.$pathpart.$relative;
} }
// FIXME: Maybe this should also be able to handle non-fancy URLs with index.php?p=...
function common_fake_local_fancy_url($url) function common_fake_local_fancy_url($url)
{ {
/** /**
@ -1416,7 +1417,7 @@ function common_fake_local_fancy_url($url)
// [4] + [5] extract index.php (+ possible leading double /) and the rest of the URL separately. // [4] + [5] extract index.php (+ possible leading double /) and the rest of the URL separately.
'(\/?index\.php\/)(.*)$/', $url, $matches)) { '(\/?index\.php\/)(.*)$/', $url, $matches)) {
// if preg_match failed to match // if preg_match failed to match
throw Exception('No known change could be made to the URL.'); throw new Exception('No known change could be made to the URL.');
} }
// now reconstruct the URL with everything except the "index.php/" part // now reconstruct the URL with everything except the "index.php/" part