mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 11:28:25 +00:00
Adding fix for Ticket #2750, fixes rendering of links when requestAction() is used.
Router::url() replaced $_this with $this which is an instance of the class from which the method is called, in the case of this ticket it was an instance of the HtmlHelper git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5319 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
52c2591055
commit
85492fba92
2 changed files with 7 additions and 7 deletions
|
@ -458,18 +458,18 @@ class Router extends Object {
|
|||
$defaults = $params = array('plugin' => null, 'controller' => null, 'action' => 'index');
|
||||
|
||||
if (!empty($_this->__params)) {
|
||||
if (!isset($_this->params['requested'])) {
|
||||
if (!isset($this->params['requested'])) {
|
||||
$params = $_this->__params[0];
|
||||
} elseif (isset($_this->params['requested'])) {
|
||||
} elseif (isset($this->params['requested'])) {
|
||||
$params = end($_this->__params);
|
||||
}
|
||||
}
|
||||
$path = array('base' => null);
|
||||
|
||||
if (!empty($_this->__paths)) {
|
||||
if (!isset($_this->params['requested'])) {
|
||||
if (!isset($this->params['requested'])) {
|
||||
$path = $_this->__paths[0];
|
||||
} elseif (isset($_this->params['requested'])) {
|
||||
} elseif (isset($this->params['requested'])) {
|
||||
$path = end($_this->__paths);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue