Release version 1.1.25

yiisoft · Dec 13, 2021 · 43e3860 · 43e3860
1 parent 13df185
commit 43e3860
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,7 +1,7 @@
                    Yii Framework Change Log
                    ========================
 
-Version 1.1.25 under development
+Version 1.1.25 December 13, 2021
 --------------------------------
 
 - Bug #4226: Fix for Gii diff displaying "reset() expects parameter 1 to be array, integer given" (LeoZandvliet, marcovtwout)

diff --git a/UPGRADE b/UPGRADE
@@ -18,6 +18,11 @@ General upgrade instructions
   issues to Yii issue tracker.
 
 
+Upgrading from v1.1.24
+----------------------
+
+No significant changes were made.
+
 Upgrading from v1.1.23
 ----------------------
 

diff --git a/framework/YiiBase.php b/framework/YiiBase.php
@@ -87,7 +87,7 @@ class YiiBase
 	 */
 	public static function getVersion()
 	{
-		return '1.1.25-dev';
+		return '1.1.25';
 	}
 
 	/**

diff --git a/framework/yiilite.php b/framework/yiilite.php
@@ -41,7 +41,7 @@ class YiiBase
 	private static $_logger;
 	public static function getVersion()
 	{
-		return '1.1.25-dev';
+		return '1.1.25';
 	}
 	public static function createWebApplication($config=null)
 	{
@@ -3003,7 +3003,7 @@ public function validateCsrfToken($event)
 				case 'DELETE':
 					$maskedUserToken=$this->getDelete($this->csrfTokenName);
 			}
-			if (!empty($maskedUserToken) && $cookies->contains($this->csrfTokenName))
+			if (!empty($maskedUserToken) && is_string($maskedUserToken) && $cookies->contains($this->csrfTokenName))
 			{
 				$securityManager=Yii::app()->getSecurityManager();
 				$maskedCookieToken=$cookies->itemAt($this->csrfTokenName)->value;