Merge 72b22d1b014840a583ff625fe109d0c3fbfbab15 into 9095ef077adfaa068181cb56ddb462461341c320
This commit is contained in:
commit
adf9b4e7ab
@ -56,12 +56,6 @@ class Url
|
||||
|
||||
$subString = mb_substr($this->uri, 0, $filterFullLenght, CHARSET);
|
||||
|
||||
// Check coincidence without the last slash at the end, this case is notfound
|
||||
if ($subString==$filterURIwoSlash) {
|
||||
$this->setNotFound();
|
||||
return false;
|
||||
}
|
||||
|
||||
// Check coincidence with complete filterURI
|
||||
if ($subString==$filterFull) {
|
||||
$this->slug = mb_substr($this->uri, $filterFullLenght);
|
||||
@ -77,6 +71,12 @@ class Url
|
||||
$this->setWhereAmI('home');
|
||||
} elseif (!empty($this->slug) && ($filterURI=='/')) {
|
||||
$this->setWhereAmI('page');
|
||||
} elseif (empty($this->slug) && ($filterName=='tag')) {
|
||||
$this->slug = $this->filters('tag');
|
||||
$this->setWhereAmI('page');
|
||||
} elseif (empty($this->slug) && ($filterName=='category')) {
|
||||
$this->slug = $this->filters('category');
|
||||
$this->setWhereAmI('page');
|
||||
} elseif ($filterName=='admin') {
|
||||
$this->slug = ltrim($this->slug, '/');
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user