diff --git a/laravel/uri.php b/laravel/uri.php index c5a135e6..9c904f86 100644 --- a/laravel/uri.php +++ b/laravel/uri.php @@ -34,14 +34,9 @@ public function __construct($server) */ public function get() { - if (is_null($this->uri)) - { - $uri = parse_url($this->server['REQUEST_URI'], PHP_URL_PATH); + if ( ! is_null($this->uri)) return $this->uri; - $this->uri = $this->format($this->clean($uri)); - } - - return $this->uri; + return $this->uri = $this->format($this->clean(parse_url($this->server['REQUEST_URI'], PHP_URL_PATH))); } /**