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

MINOR: Minor fixes after new SS_List interfaces cleanup

Browse Source
This commit is contained in:
Sam Minnee 2012-03-09 17:50:32 +13:00
parent 83bfe54b01
commit adbcf61c56
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Object.php
View File

@ -605,7 +605,7 @@ abstract class Object {
user_error("Bad extension '$extension'", E_USER_WARNING); user_error("Bad extension '$extension'", E_USER_WARNING);
} else { } else {
$extensionClass = $matches[1]; $extensionClass = $matches[1];
DataObjectDecorator::unload_extra_statics($class, $extensionClass); DataExtension::unload_extra_statics($class, $extensionClass);
} }
} }

2
forms/gridfield/GridField.php
View File

@ -650,7 +650,7 @@ class GridField extends FormField {
continue; continue;
} }
if(is_array($component->getActions($this)) && in_array($actionName, array_map('strtolower', $component->getActions($this)))) { if(in_array($actionName, array_map('strtolower', (array)$component->getActions($this)))) {
return $component->handleAction($this, $actionName, $args, $data); return $component->handleAction($this, $actionName, $args, $data);
} }
} }

2
model/ListDecorator.php
View File

@ -137,7 +137,7 @@ abstract class SS_ListDecorator extends ViewableData implements SS_List, SS_Sort
} }
public function limit($limit, $offset = 0) { public function limit($limit, $offset = 0) {
return $this->list->getRange($length, $offset); return $this->list->limit($limit, $offset);
} }
/** /**