tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: When Up called and we are at the top of the scope, throw a useful error, not just an index undefined error

Browse Source
This commit is contained in:
Hamish Friedlander 2012-04-11 22:08:05 +12:00
parent 556950de47
commit 5c336329b6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
view/SSViewer.php
View File

@ -31,8 +31,8 @@ class SSViewer_Scope {
protected $itemIteratorTotal; //Total number of items in the iterator protected $itemIteratorTotal; //Total number of items in the iterator
private $popIndex; // A pointer into the item stack for which item should be scope on the next pop call private $popIndex; // A pointer into the item stack for which item should be scope on the next pop call
private $upIndex; // A pointer into the item stack for which item is "up" from this one private $upIndex = null; // A pointer into the item stack for which item is "up" from this one
private $currentIndex; // A pointer into the item stack for which item is this one (or null if not in stack yet) private $currentIndex = null; // A pointer into the item stack for which item is this one (or null if not in stack yet)
private $localIndex; private $localIndex;
@ -56,6 +56,8 @@ class SSViewer_Scope {
switch ($name) { switch ($name) {
case 'Up': case 'Up':
if ($this->upIndex === null) user_error('Up called when we\'re already at the top of the scope', E_USER_ERROR);
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];
break; break;