Merge branch '12.0' into 12.1

Author: freost

CHANGELOG.md

@@ -1,3 +1,11 @@
+### 12.0.3, 12.1.1 <small>(2026-03-01)</small>
+
+#### Bugfixes
+
+* Fixed an error in the 429 error template.
+
+--------------------------------------------------------
+
 ### 12.1.0 <small>(2026-02-20)</small>
 
 #### New
@@ -22,7 +30,6 @@
 
 --------------------------------------------------------
 
-
 ### 11.4.6, 12.0.2 <small>(2026-01-08)</small>
 
 #### Bugfixes

src/mako/Mako.php

@@ -15,7 +15,7 @@ final class Mako
 	/**
 	 * Mako version.
 	 */
-	public const string VERSION = '12.1.0';
+	public const string VERSION = '12.1.1';
 
 	/**
 	 * Mako major version.
@@ -30,5 +30,5 @@ final class Mako
 	/**
 	 * Mako patch version.
 	 */
-	public const int VERSION_PATCH = 0;
+	public const int VERSION_PATCH = 1;
 }

src/mako/error/handlers/web/views/429.tpl.php

@@ -15,7 +15,7 @@
 		&& $retryAfter->getTimezone()->getName() !== 'UTC'
 		&& ($retryAfter instanceof DateTime || $retryAfter instanceof DateTimeImmutable)
 	) {
-		$retryAfter->setTimezone(new DateTimeZone('UTC'));
+		$retryAfter = $retryAfter->setTimezone(new DateTimeZone('UTC'));
 		$retryAfter = $retryAfter->format('Y-m-d\TH:i:sP');
 	}
 }