Merge branch '3.1' into 3

silverstripe · Oct 26, 2023 · 7366b96 · 7366b96
2 parents 9b688ad + c19d901
commit 7366b96
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/VersionFeed.php b/src/VersionFeed.php
@@ -203,7 +203,6 @@ public function updateSettingsFields(FieldList $fields)
 
     public function getSiteRSSLink()
     {
-        // TODO: This link should be from the homepage, not this page.
         if (Config::inst()->get(get_class(), 'allchanges_enabled')
             && SiteConfig::current_site_config()->AllChangesEnabled
         ) {

diff --git a/tests/VersionFeedFunctionalTest.php b/tests/VersionFeedFunctionalTest.php
@@ -175,7 +175,7 @@ public function testChangesActionContainsChangesForCurrentPageOnly()
         $titles = array_map(function ($item) {
             return (string)$item->title;
         }, $xml->xpath('//item') ?? []);
-        // TODO Unclear if this should contain the original version
+
         $this->assertContains('Changed: Page1', $titles);
         $this->assertNotContains('Changed: Page2', $titles);
 
@@ -184,7 +184,7 @@ public function testChangesActionContainsChangesForCurrentPageOnly()
         $titles = array_map(function ($item) {
             return (string)$item->title;
         }, $xml->xpath('//item') ?? []);
-        // TODO Unclear if this should contain the original version
+
         $this->assertNotContains('Changed: Page1', $titles);
         $this->assertContains('Changed: Page2', $titles);
     }