Merge branch 'develop' into pr/1051

This commit is contained in:
Kijin Sung 2018-08-06 01:08:51 +09:00
commit 2c9bb88a14
19 changed files with 132 additions and 159 deletions

View file

@ -18,7 +18,8 @@ class URL
*/
public static function getCurrentURL(array $changes = array())
{
$url = self::getCurrentDomainURL(isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/');
$request_uri = preg_replace('/[<>"]/', '', isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/');
$url = self::getCurrentDomainURL($request_uri);
if (count($changes))
{
return self::modifyURL($url, $changes);