Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-04 12:49:06 +02:00
Code Issues Packages Projects Releases Activity

Added language support to the initializeFromUrl() method

Browse Source
This commit is contained in:
Andy Miller
2016-02-01 22:53:13 -07:00
parent 6222b22e2a
commit 51104a1d55
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
system/src/Grav/Common/Uri.php
View File

@@ -197,6 +197,10 @@ class Uri
$this->root = [];
$this->url = [];
$grav = Grav::instance();
$language = $grav['language'];
$params = Uri::parseUrl($url);
$this->name = $params['host'];
@@ -204,6 +208,9 @@ class Uri
$this->uri = $params['path'];
// set active language
$uri = $language->setActiveFromUri($this->uri);
if (isset($params['params'])) {
$this->params($params['params']);
}
@@ -218,7 +225,8 @@ class Uri
$this->env = $this->buildEnvironment();
$this->root_path = $this->buildRootPath();
$this->root = $this->base . $this->root_path;
$this->url = $this->base . $this->uri;
$this->url = $this->root . $uri;
$this->path = $uri;
return $this;
}