Merge branch '2'
This commit is contained in:
commit
5c1cedeb98
|
@ -5,6 +5,7 @@ en:
|
|||
PermissionFail: 'You don''t have permission to create a {class}.'
|
||||
SilverStripe\Blog\Forms\GridField\GridFieldBlogPostState:
|
||||
Draft: 'Saved as Draft on {date}'
|
||||
Modified: 'Modified'
|
||||
Published: 'Published on {date}'
|
||||
Timer: 'Publish at {date}'
|
||||
SilverStripe\Blog\Model:
|
||||
|
|
|
@ -23,7 +23,7 @@ class GridFieldBlogPostState extends GridFieldSiteTreeState
|
|||
$modifiedLabel = '';
|
||||
|
||||
if ($record->isModifiedOnStage) {
|
||||
$modifiedLabel = '<span class="modified">' . _t(__CLASS__ . '.Modified') . '</span>';
|
||||
$modifiedLabel = '<span class="modified">' . _t(__CLASS__ . '.Modified', 'Modified') . '</span>';
|
||||
}
|
||||
|
||||
if (!$record->isPublished()) {
|
||||
|
|
|
@ -443,7 +443,7 @@ class BlogController extends PageController
|
|||
$posts->setPageLength($pageSize);
|
||||
|
||||
// Set current page
|
||||
$start = $this->request->getVar($posts->getPaginationGetVar());
|
||||
$start = (int)$this->request->getVar($posts->getPaginationGetVar());
|
||||
$posts->setPageStart($start);
|
||||
|
||||
return $posts;
|
||||
|
|
Loading…
Reference in New Issue