diff --git a/composer.json b/composer.json index d2b99e4..972b98c 100644 --- a/composer.json +++ b/composer.json @@ -16,14 +16,14 @@ } ], "require": { - "php": "^7.4 || ^8.0", - "silverstripe/cms": "^4", - "silverstripe/versioned": "^1", - "silverstripe/siteconfig": "^4" + "php": "^8.1", + "silverstripe/cms": "^5", + "silverstripe/versioned": "^2", + "silverstripe/siteconfig": "^5" }, "require-dev": { "phpunit/phpunit": "^9.5", - "squizlabs/php_codesniffer": "^3.0" + "squizlabs/php_codesniffer": "^3" }, "autoload": { "psr-4": { diff --git a/src/VersionFeed.php b/src/VersionFeed.php index 64b9558..604f332 100644 --- a/src/VersionFeed.php +++ b/src/VersionFeed.php @@ -80,7 +80,7 @@ class VersionFeed extends SiteTreeExtension $qLimit = (int)$limit + 1; $versions = $this->owner->Versions( "\"WasPublished\"='1' AND \"CanViewType\" IN ('Anyone', 'Inherit') $offset", - "\"SiteTree\".\"LastEdited\" DESC, \"SiteTree\".\"ID\" DESC", + "\"LastEdited\" DESC, \"ID\" DESC", $qLimit ); diff --git a/src/VersionFeedController.php b/src/VersionFeedController.php index 47e8b5d..05072b0 100644 --- a/src/VersionFeedController.php +++ b/src/VersionFeedController.php @@ -114,7 +114,6 @@ class VersionFeedController extends Extension AND ("PublicHistory" IS NULL OR "PublicHistory" = \'1\') ORDER BY "LastEdited" DESC LIMIT ' . $limit); $lastChange = $latestChanges->record(); - $latestChanges->rewind(); if ($lastChange) { // Cache the diffs to remove DOS possibility.