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

Merge branch '2.4' into 2.5

This commit is contained in:
Robbie Averill 2018-02-20 11:01:29 +13:00
parent 1a9cdee0f2 767250435e
commit c76cbcb0f0
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -36,7 +36,7 @@ matrix:
env: DB=PGSQL CORE_RELEASE=3.5 env: DB=PGSQL CORE_RELEASE=3.5
- php: 5.4 - php: 5.4
env: DB=SQLITE env: DB=SQLITE
- php: 5.3 - php: 5.4
env: DB=MYSQL env: DB=MYSQL
- php: 7.1 - php: 7.1
env: DB=MYSQL CORE_RELEASE=3.6 env: DB=MYSQL CORE_RELEASE=3.6

2
code/forms/gridfield/GridFieldBlogPostState.php
View File

@ -20,7 +20,7 @@ class GridFieldBlogPostState extends GridFieldSiteTreeState
$modifiedLabel = ''; $modifiedLabel = '';
if ($record->isModifiedOnStage) { if ($record->isModifiedOnStage) {
$modifiedLabel = '<span class="modified">' . _t('GridFieldBlogPostState.Modified') . '</span>'; $modifiedLabel = '<span class="modified">' . _t('GridFieldBlogPostState.Modified', 'Modified') . '</span>';
} }
if (!$record->isPublished()) { if (!$record->isPublished()) {

2
code/model/Blog.php
View File

@ -1043,7 +1043,7 @@ class Blog_Controller extends Page_Controller
$posts->setPageLength($pageSize); $posts->setPageLength($pageSize);
// Set current page // Set current page
$start = $this->request->getVar($posts->getPaginationGetVar()); $start = (int)$this->request->getVar($posts->getPaginationGetVar());
$posts->setPageStart($start); $posts->setPageStart($start);
return $posts; return $posts;

1
lang/en.yml
View File

@ -121,6 +121,7 @@ en:
PermissionFail: 'You don''t have permission to create a {class}.' PermissionFail: 'You don''t have permission to create a {class}.'
GridFieldBlogPostState: GridFieldBlogPostState:
Draft: '<i class="btn-icon gridfield-icon btn-icon-pencil"></i> Saved as Draft on {date}' Draft: '<i class="btn-icon gridfield-icon btn-icon-pencil"></i> Saved as Draft on {date}'
Modified: 'Modified'
Published: '<i class="btn-icon gridfield-icon btn-icon-accept"></i> Published on {date}' Published: '<i class="btn-icon gridfield-icon btn-icon-accept"></i> Published on {date}'
Timer: '<i class="gridfield-icon blog-icon-timer"></i> Publish at {date}' Timer: '<i class="gridfield-icon blog-icon-timer"></i> Publish at {date}'
TagCloudWidget: TagCloudWidget: