bn8/ldapsaisie
1
0
Fork 0
mirror of https://gitlab.easter-eggs.com/ee/ldapsaisie.git synced 2024-12-19 06:53:53 +01:00
Code Issues Projects Releases Wiki Activity

Fix LSurl :: get_rewrite_base() method (again)

Browse source
This commit is contained in:
Benjamin Renard 2020-06-25 16:17:38 +02:00
parent c36b385e0f
commit d0beb86b3d
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/includes/class/class.LSurl.php
View file

@ -314,11 +314,14 @@ class LSurl extends LSlog_staticLoggerClass {
**/ **/
private static function get_rewrite_base() { private static function get_rewrite_base() {
$public_root_url = LSconfig :: get('public_root_url', '/', 'string'); $public_root_url = LSconfig :: get('public_root_url', '/', 'string');
$rewrite_base = '/';
if (preg_match('|^https?://[^/]+(/.*)$|', $public_root_url, $m)) if (preg_match('|^https?://[^/]+(/.*)$|', $public_root_url, $m))
return self :: remove_trailing_slash($m[1]).'/'; return $rewrite_base = $m[1];
elseif (preg_match('|^(/.+)$|', $public_root_url, $m)) elseif (preg_match('|^(/.+)$|', $public_root_url, $m))
return self :: remove_trailing_slash($m[1]).'/'; return $rewrite_base = $m[1];
return '/'; if ($rewrite_base != '/')
return self :: remove_trailing_slash($rewrite_base).'/';
return $rewrite_base;
} }
/** /**