summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwei <>2006-03-09 07:13:18 +0000
committerwei <>2006-03-09 07:13:18 +0000
commitf1cf062710ae5fba098b2775949a083f7457e82b (patch)
tree6029c7af8083f9ebf37ffe9cd4006425716e0bca
parent63a44e9ea0e8b210d656a20878581d963bb23168 (diff)
changed default current page index to -1, modified itemAt($index)
-rw-r--r--framework/Collections/TPagedList.php7
-rw-r--r--framework/I18N/TChoiceFormat.php1
2 files changed, 6 insertions, 2 deletions
diff --git a/framework/Collections/TPagedList.php b/framework/Collections/TPagedList.php
index b07217b7..9637f499 100644
--- a/framework/Collections/TPagedList.php
+++ b/framework/Collections/TPagedList.php
@@ -68,7 +68,7 @@ class TPagedList extends TList
/**
* @var integer current page index
*/
- private $_currentPageIndex=0;
+ private $_currentPageIndex=-1;
/**
* @var integer user-assigned number of items in data source
*/
@@ -310,7 +310,10 @@ class TPagedList extends TList
*/
public function itemAt($index)
{
- return parent::itemAt($this->_pageSize*$this->_currentPageIndex+$index);
+ if($this->_customPaging)
+ return parent::itemAt($index);
+ else
+ return parent::itemAt($this->_pageSize*$this->_currentPageIndex+$index);
}
/**
diff --git a/framework/I18N/TChoiceFormat.php b/framework/I18N/TChoiceFormat.php
index 24080700..255bf638 100644
--- a/framework/I18N/TChoiceFormat.php
+++ b/framework/I18N/TChoiceFormat.php
@@ -20,6 +20,7 @@
* Get the ChoiceFormat class.
*/
Prado::using('System.I18N.core.ChoiceFormat');
+Prado::using('System.I18N.TTranslate');
/**
* TChoiceFormat class.