1、内核更新

2、bug修复
2016-07-14 15:50:24 +08:00
parent 4b72704c77
commit 7ece5519ae
12 changed files with 204 additions and 182 deletions
--- a/core/library/think/paginator/Collection.php
+++ b/core/library/think/paginator/Collection.php
@@ -23,6 +23,8 @@ use think\Paginator;
 * @method string render()
 * @method Paginator fragment($fragment)
 * @method Paginator appends($key, $value)
+ * @method integer lastPage()
+ * @method boolean hasPages()
 */
 class Collection extends \think\Collection
 {
@@ -40,17 +42,7 @@ class Collection extends \think\Collection
    {
        return new static($items, $paginator);
    }
-
-    public function setPaginator(Paginator $paginator)
-    {
-        $this->paginator = $paginator;
-    }
-
-    public function getPaginator()
-    {
-        return $this->paginator;
-    }
-
+    
    public function toArray()
    {
        if ($this->paginator) {