mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-18 18:46:17 +00:00
fixing errors resulting from removal of argSeparator and namedArgs
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5537 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
e65c404c9c
commit
b222afd20b
2 changed files with 2 additions and 2 deletions
|
@ -231,7 +231,7 @@ class Dispatcher extends Object {
|
|||
array_push($controller->helpers, $controller->webservices);
|
||||
}
|
||||
|
||||
Router::setRequestInfo(array($this->params, array('base' => $this->base, 'here' => $this->here, 'webroot' => $this->webroot, 'passedArgs' => $controller->passedArgs, 'argSeparator' => $controller->argSeparator, 'namedArgs' => $controller->namedArgs, 'webservices' => $controller->webservices)));
|
||||
Router::setRequestInfo(array($this->params, array('base' => $this->base, 'here' => $this->here, 'webroot' => $this->webroot)));
|
||||
$controller->_initComponents();
|
||||
|
||||
if(isset($this->plugin)) {
|
||||
|
|
|
@ -847,7 +847,7 @@ class View extends Object {
|
|||
$camelBackedHelper = Inflector::variable($helper);
|
||||
${$camelBackedHelper} =& new $helperCn();
|
||||
|
||||
$vars = array('base', 'webroot', 'here', 'params', 'action', 'data', 'themeWeb', 'plugin', 'namedArgs', 'argSeparator');
|
||||
$vars = array('base', 'webroot', 'here', 'params', 'action', 'data', 'themeWeb', 'plugin');
|
||||
$c = count($vars);
|
||||
for ($j = 0; $j < $c; $j++) {
|
||||
${$camelBackedHelper}->{$vars[$j]} = $this->{$vars[$j]};
|
||||
|
|
Loading…
Add table
Reference in a new issue