Merge branch '2.4' into 2.5

silverstripe · Feb 19, 2018 · c76cbcb · c76cbcb
2 parents 1a9cdee + 7672504
commit c76cbcb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -36,7 +36,7 @@ matrix:
       env: DB=PGSQL CORE_RELEASE=3.5
     - php: 5.4
       env: DB=SQLITE
-    - php: 5.3
+    - php: 5.4
       env: DB=MYSQL
     - php: 7.1
       env: DB=MYSQL CORE_RELEASE=3.6

diff --git a/code/forms/gridfield/GridFieldBlogPostState.php b/code/forms/gridfield/GridFieldBlogPostState.php
@@ -20,7 +20,7 @@ public function getColumnContent($gridField, $record, $columnName)
                 $modifiedLabel = '';
 
                 if ($record->isModifiedOnStage) {
-                    $modifiedLabel = '<span class="modified">' . _t('GridFieldBlogPostState.Modified') . '</span>';
+                    $modifiedLabel = '<span class="modified">' . _t('GridFieldBlogPostState.Modified', 'Modified') . '</span>';
                 }
 
                 if (!$record->isPublished()) {

diff --git a/code/model/Blog.php b/code/model/Blog.php
@@ -1043,7 +1043,7 @@ public function PaginatedList()
         $posts->setPageLength($pageSize);
 
         // Set current page
-        $start = $this->request->getVar($posts->getPaginationGetVar());
+        $start = (int)$this->request->getVar($posts->getPaginationGetVar());
         $posts->setPageStart($start);
 
         return $posts;

diff --git a/lang/en.yml b/lang/en.yml
@@ -121,6 +121,7 @@ en:
     PermissionFail: 'You don''t have permission to create a {class}.'
   GridFieldBlogPostState:
     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}'
     Timer: '<i class="gridfield-icon blog-icon-timer"></i> Publish at {date}'
   TagCloudWidget: