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

API CHANGE DataObject::getComponents() should use default value for limit as NULL

Browse Source
This commit is contained in:
Stig Lindqvist 2012-03-09 15:15:55 +13:00
parent 426f16764c
commit 2cb67efe07
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
model/DataList.php
View File

@ -146,7 +146,10 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab
* @param string $limit * @param string $limit
*/ */
public function limit($limit, $offset = 0) { public function limit($limit, $offset = 0) {
if(!is_numeric($limit)) { if(!$limit && !$offset) {
return $this;
}
if($limit && !is_numeric($limit)) {
Deprecation::notice('3.0', 'Please pass limits as 2 arguments, rather than an array or SQL fragment.'); Deprecation::notice('3.0', 'Please pass limits as 2 arguments, rather than an array or SQL fragment.');
} }
$this->dataQuery->limit($limit, $offset); $this->dataQuery->limit($limit, $offset);

2
model/DataObject.php
View File

@ -1309,7 +1309,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* *
* @return HasManyList The components of the one-to-many relationship. * @return HasManyList The components of the one-to-many relationship.
*/ */
public function getComponents($componentName, $filter = "", $sort = "", $join = "", $limit = "") { public function getComponents($componentName, $filter = "", $sort = "", $join = "", $limit = null) {
$result = null; $result = null;
if(!$componentClass = $this->has_many($componentName)) { if(!$componentClass = $this->has_many($componentName)) {