diff --git a/.travis.yml b/.travis.yml index a10d84447..58d05be50 100755 --- 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 index 3d01ce491..b57662b36 100644 --- 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 = '' . _t('GridFieldBlogPostState.Modified') . ''; + $modifiedLabel = '' . _t('GridFieldBlogPostState.Modified', 'Modified') . ''; } if (!$record->isPublished()) { diff --git a/code/model/Blog.php b/code/model/Blog.php index 238ddcdc4..3475e393f 100644 --- 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 index 891b51a83..e332072f7 100755 --- 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: ' Saved as Draft on {date}' + Modified: 'Modified' Published: ' Published on {date}' Timer: ' Publish at {date}' TagCloudWidget: