Merge branch 'v3' of https://github.com/craftcms/cms into develop

Author: brandonkelly

CHANGELOG.md

@@ -14,6 +14,7 @@
 - Fixed a bug where user group condition rules for the default user group weren’t getting matched properly during public registration. ([#12283](https://github.com/craftcms/cms/issues/12283))
 - Fixed a bug where HTML tags within field labels, instructions, tips, and warnings weren’t always getting escaped.
 - Fixed a bug where the sidebar scroll position wasn’t retained when selecting a new source on element index pages. ([#12523](https://github.com/craftcms/cms/issues/12523))
+- Fixed a bug where `resave/*` commands’ output didn’t take the offset into account. ([#12526](https://github.com/craftcms/cms/issues/12526))
 - Deprecated `craft\helpers\DateTimeHelper::timeZoneAbbreviation()`.
 - Deprecated `craft\helpers\DateTimeHelper::timeZoneOffset()`.
 

src/console/controllers/ResaveController.php

@@ -468,6 +468,10 @@ private function _resaveElements(ElementQueryInterface $query): int
             return ExitCode::OK;
         }
 
+        if ($query->offset) {
+            $count = max($count - (int)$query->offset, 0);
+        }
+
         if ($query->limit) {
             $count = min($count, (int)$query->limit);
         }