tonyair
/
silverstripe-blog
mirror of https://github.com/silverstripe/silverstripe-blog
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MINOR: Merge ss3-fixes into master

This commit is contained in:
carlos barberis 2012-07-08 11:25:53 +12:00
parent 2cbbe096ca 6dd0e7dd06
commit fae45f3826
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/BlogEntry.php
View File

@ -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());
}
}

14
code/BlogTree.php
View File

@ -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);
}
/**