adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-18 10:36:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding fix for windows paths in view, thanks renan`saddam for reporting and debugging

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6895 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2008-05-15 23:57:24 +00:00
parent de086b1be3
commit 84739652c8
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cake/libs/view/view.php
View file

@ -766,20 +766,18 @@ class View extends Object {
$name = $this->action; $name = $this->action;
} }
$name = str_replace('/', DS, $name);
if (strpos($name, DS) === false && strpos($name, '..') === false) { if (strpos($name, DS) === false && strpos($name, '..') === false) {
$name = $this->viewPath . DS . $subDir . Inflector::underscore($name); $name = $this->viewPath . DS . $subDir . Inflector::underscore($name);
} elseif (strpos($name, DS) !== false) { } elseif (strpos($name, DS) !== false) {
if ($name{0} === '/' || $name{1} === ':') { if ($name{0} === DS || $name{1} === ':') {
if (is_file($name)) { if (is_file($name)) {
return $name; return $name;
} }
$name = trim($name, '/'); $name = trim($name, DS);
} else { } else {
$name = $this->viewPath . DS . $subDir . $name; $name = $this->viewPath . DS . $subDir . $name;
} }
if (DS !== '/') {
$name = implode(DS, explode('/', $name));
}
} elseif (strpos($name, '..') !== false) { } elseif (strpos($name, '..') !== false) {
$name = explode('/', $name); $name = explode('/', $name);
$i = array_search('..', $name); $i = array_search('..', $name);