tonyair/silverstripe-blog
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-blog synced 2024-10-22 11:05:58 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #727 from nathanbrauer/feature/update-for-versioned-1.12

Browse Source 
Bugfix: Updating BlogPostFilter::augmentSQL to make use of modern Versioned methods.
This commit is contained in:
Sabina Talipova 2023-09-26 08:51:37 +13:00 committed by GitHub
commit 4ca99d07f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Model/BlogPostFilter.php
View File

@ -28,13 +28,17 @@ class BlogPostFilter extends DataExtension
*/ */
public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null) public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
{ {
$stage = Versioned::get_stage();
if (Controller::has_curr() && Controller::curr() instanceof LeftAndMain) { if (Controller::has_curr() && Controller::curr() instanceof LeftAndMain) {
return; return;
} }
if ($stage == 'Live' || !Permission::check('VIEW_DRAFT_CONTENT')) { if (Versioned::get_stage() === Versioned::LIVE ||
(
Versioned::get_draft_site_secured() &&
!Permission::check('VIEW_DRAFT_CONTENT')
)
) {
$query->addWhere(sprintf( $query->addWhere(sprintf(
'"PublishDate" < \'%s\'', '"PublishDate" < \'%s\'',
Convert::raw2sql(DBDatetime::now()) Convert::raw2sql(DBDatetime::now())