From 03ea2b8287dc601cf435dedc9b6fdaa233a1a99b Mon Sep 17 00:00:00 2001 From: phpnut Date: Fri, 22 Jun 2007 01:25:35 +0000 Subject: [PATCH] Adding fix for Router::url() when static call is made outside of an object instance git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5329 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/libs/router.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cake/libs/router.php b/cake/libs/router.php index d29d7b6fd..7111aab2c 100644 --- a/cake/libs/router.php +++ b/cake/libs/router.php @@ -458,18 +458,22 @@ 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) && !isset($this->params['requested'])) { $params = $_this->__params[0]; - } elseif (isset($this->params['requested'])) { + } elseif (isset($this) && isset($this->params['requested'])) { + $params = end($_this->__params); + } else { $params = end($_this->__params); } } $path = array('base' => null); if (!empty($_this->__paths)) { - if (!isset($this->params['requested'])) { + if (isset($this) && !isset($this->params['requested'])) { $path = $_this->__paths[0]; - } elseif (isset($this->params['requested'])) { + } elseif (isset($this) && isset($this->params['requested'])) { + $path = end($_this->__paths); + } else { $path = end($_this->__paths); } }