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

Fix reset after recent merge

Browse Source
This commit is contained in:
Flavio Copes
2016-01-18 10:09:01 +01:00
parent 0e6132800e
commit 067f75389b
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,8 +44,8 @@ class Uri
$this->uri = $this->buildUri();
$this->base = $this->buildBaseUrl();
$this->host = $this->buildHost();
$root_path = $this->buildRootPath();
$this->root = $this->base . $root_path;
$this->root_path = $this->buildRootPath();
$this->root = $this->base . $this->root_path;
$this->url = $this->base . $this->uri;
}
@@ -187,7 +187,6 @@ class Uri
$this->name = $params['host'];
$this->port = $params['port'];
$this->uri = $params['path'];
if (isset($params['query'])) {
$this->uri .= '?' . $params['query'];
parse_str($params['query'], $this->query);
@@ -196,14 +195,10 @@ class Uri
$this->base = $this->buildBaseUrl();
$this->host = $this->buildHost();
$root_path = $this->buildRootPath();
$this->root = $this->base . $root_path;
$this->root_path = $this->buildRootPath();
$this->root = $this->base . $this->root_path;
$this->url = $this->base . $this->uri;
$this->port = $port;
$this->base = $base;
$this->uri = $uri;
$this->root_path = $root_path;
}
/**
@@ -216,11 +211,6 @@ class Uri
$config = $grav['config'];
$language = $grav['language'];
// resets
$this->paths = [];
$this->params = [];
$this->query = [];
// add the port to the base for non-standard ports
if ($config->get('system.reverse_proxy_setup') == false && $this->port != '80' && $this->port != '443') {
$this->base .= ":".$this->port;