forked from GNUsocial/gnu-social
[CORE] Allow to force non-fancy URLs
Essential to allow toggling fancy urls later. In some cases it is critical to keep the URL an unique URI.
This commit is contained in:
parent
d058a70557
commit
aa994ee4fb
@ -1383,7 +1383,7 @@ function common_relative_profile($sender, $nickname, $dt=null)
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
function common_local_url($action, $args=null, $params=null, $fragment=null, $addSession=true)
|
function common_local_url($action, $args=null, $params=null, $fragment=null, $addSession=true, $defancy = false)
|
||||||
{
|
{
|
||||||
if (Event::handle('StartLocalURL', [&$action, &$params, &$fragment, &$addSession, &$url])) {
|
if (Event::handle('StartLocalURL', [&$action, &$params, &$fragment, &$addSession, &$url])) {
|
||||||
$r = Router::get();
|
$r = Router::get();
|
||||||
@ -1391,7 +1391,7 @@ function common_local_url($action, $args=null, $params=null, $fragment=null, $ad
|
|||||||
|
|
||||||
$ssl = GNUsocial::useHTTPS();
|
$ssl = GNUsocial::useHTTPS();
|
||||||
|
|
||||||
if (common_config('site', 'fancy')) {
|
if (common_config('site', 'fancy') && !$defancy) {
|
||||||
$url = common_path($path, $ssl, $addSession);
|
$url = common_path($path, $ssl, $addSession);
|
||||||
} else {
|
} else {
|
||||||
if (mb_strpos($path, '/index.php') === 0) {
|
if (mb_strpos($path, '/index.php') === 0) {
|
||||||
|
Loading…
Reference in New Issue
Block a user