FIX Don't hardcode table name (#629)

BlogFilter had some hardcoded references to BlogPost table; when you rename this table, e.g. to "News", some joins broke.
silverstripe · May 10, 2024 · bad865d · bad865d
1 parent 799cc44
commit bad865d
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Model/BlogFilter.php b/src/Model/BlogFilter.php
@@ -35,10 +35,11 @@ public function stageChildren($showAll = false)
                 $stage = '_' . $stage;
             }
 
+            $blogPostTable = DataObject::getSchema()->tableName(BlogPost::class);
             $dataQuery = $staged->dataQuery()
                 ->innerJoin(
-                    DataObject::getSchema()->tableName(BlogPost::class),
-                    sprintf('"BlogPost%s"."ID" = "SiteTree%s"."ID"', $stage, $stage)
+                    $blogPostTable,
+                    sprintf('"' . $blogPostTable . '%s"."ID" = "SiteTree%s"."ID"', $stage, $stage)
                 )
                 ->where(sprintf('"PublishDate" < \'%s\'', Convert::raw2sql(DBDatetime::now())));
 
@@ -64,10 +65,11 @@ public function liveChildren($showAll = false, $onlyDeletedFromStage = false)
         $staged = parent::liveChildren($showAll, $onlyDeletedFromStage);
 
         if (!$this->shouldFilter() && $this->isBlog() && !Permission::check('VIEW_DRAFT_CONTENT')) {
+            $blogPostTable = DataObject::getSchema()->tableName(BlogPost::class);
             $dataQuery = $staged->dataQuery()
                 ->innerJoin(
-                    DataObject::getSchema()->tableName(BlogPost::class),
-                    '"BlogPost_Live"."ID" = "SiteTree_Live"."ID"'
+                    $blogPostTable,
+                    '"' . $blogPostTable . '_Live"."ID" = "SiteTree_Live"."ID"'
                 )
                 ->where(sprintf('"PublishDate" < \'%s\'', Convert::raw2sql(DBDatetime::now())));