diff --git a/code/BlogEntry.php b/code/BlogEntry.php index e71c2e2..4b5a15e 100644 --- a/code/BlogEntry.php +++ b/code/BlogEntry.php @@ -255,7 +255,7 @@ class BlogEntry_Controller extends Page_Controller { $page->deleteFromStage('Live'); $page->flushCache(); - Director::redirect($this->getParent()->Link()); + $this->redirect($this->getParent()->Link()); } } diff --git a/code/BlogTree.php b/code/BlogTree.php index df76abc..9937613 100644 --- a/code/BlogTree.php +++ b/code/BlogTree.php @@ -211,8 +211,12 @@ class BlogTree extends Page { // By specifying a callback, you can alter the SQL, or sort on something other than date. if($retrieveCallback) return call_user_func($retrieveCallback, 'BlogEntry', $filter, $limit, $order); - - return DataObject::get('BlogEntry', $filter, $order, '', $limit); + + $entries = BlogEntry::get()->where($filter)->sort($order); + + $list = new PaginatedList($entries, Controller::curr()->request); + $list->setPageLength($limit); + return $list; } } @@ -262,12 +266,10 @@ class BlogTree_Controller extends Page_Controller { else if(isset($_GET['authorID'])) { $filter .= " \"BlogEntry\".\"AuthorID\" = '". Convert::raw2sql($_GET['authorID']). "'"; } - - $start = isset($_GET['start']) ? (int) $_GET['start'] : 0; - + $date = $this->SelectedDate(); - return $this->Entries("$start,$limit", $this->SelectedTag(), ($date) ? $date : '', null, $filter); + return $this->Entries($limit, $this->SelectedTag(), ($date) ? $date : '', null, $filter); } /**