tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-26 06:29:24 +02:00
Code Issues Projects Releases Wiki Activity

Reset ...

Browse Source
This commit is contained in:
Dominik Beerbohm 2012-01-17 00:57:39 +01:00
parent 09c1f8f576
commit 82ef236879
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
view/SSViewer.php
View File

@ -50,8 +50,8 @@ class SSViewer_Scope {
array_splice($this->itemStack, $this->localIndex+1); array_splice($this->itemStack, $this->localIndex+1);
} }
function obj($name, $arguments = array()) { function obj($name){
switch ($name) { switch ($name) {
case 'Up': case 'Up':
list($this->item, $this->itemIterator, $unused2, $this->upIndex, $this->currentIndex) = $this->itemStack[$this->upIndex]; list($this->item, $this->itemIterator, $unused2, $this->upIndex, $this->currentIndex) = $this->itemStack[$this->upIndex];
@ -63,9 +63,10 @@ class SSViewer_Scope {
default: default:
$on = $this->itemIterator ? $this->itemIterator->current() : $this->item; $on = $this->itemIterator ? $this->itemIterator->current() : $this->item;
$this->item = call_user_func_array(array($on, 'obj'), (array) $arguments); $arguments = func_get_args();
$this->item = call_user_func_array(array($on, 'obj'), $arguments);
$this->itemIterator = null; $this->itemIterator = null;
$this->upIndex = $this->currentIndex ? $this->currentIndex : count($this->itemStack)-1; $this->upIndex = $this->currentIndex ? $this->currentIndex : count($this->itemStack)-1;
$this->currentIndex = count($this->itemStack); $this->currentIndex = count($this->itemStack);