From a5ab20cfd655d77800c74e3a26a0db9535d8da8a Mon Sep 17 00:00:00 2001
From: Marco van 't Wout <marco@tremani.nl>
Date: Mon, 7 Jun 2021 15:16:45 +0200
Subject: [PATCH] Release version 1.1.24

---
 CHANGELOG             |  2 +-
 framework/YiiBase.php |  2 +-
 framework/yiilite.php | 12 +++++-------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 207374c164..8dcfec3030 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
                    Yii Framework Change Log
                    ========================
 
-Version 1.1.24 under development
+Version 1.1.24 June 7, 2021
 --------------------------------
 
 - Bug #4339: "There is no active transaction" when transaction is autocommitted (twisted1919)
diff --git a/framework/YiiBase.php b/framework/YiiBase.php
index b2b0db09cb..b0928013c2 100644
--- a/framework/YiiBase.php
+++ b/framework/YiiBase.php
@@ -87,7 +87,7 @@ class YiiBase
 	 */
 	public static function getVersion()
 	{
-		return '1.1.24-dev';
+		return '1.1.24';
 	}
 
 	/**
diff --git a/framework/yiilite.php b/framework/yiilite.php
index 8db4a1ca4b..de8de1c117 100644
--- a/framework/yiilite.php
+++ b/framework/yiilite.php
@@ -41,7 +41,7 @@ class YiiBase
 	private static $_logger;
 	public static function getVersion()
 	{
-		return '1.1.24-dev';
+		return '1.1.24';
 	}
 	public static function createWebApplication($config=null)
 	{
@@ -1542,9 +1542,7 @@ public function handleError($code,$message,$file,$line)
 			restore_exception_handler();
 			$log="$message ($file:$line)\nStack trace:\n";
 			$trace=debug_backtrace();
-			// skip the first 3 stacks as they do not tell the error position
-			if(count($trace)>3)
-				$trace=array_slice($trace,3);
+			array_shift($trace);
 			foreach($trace as $i=>$t)
 			{
 				if(!isset($t['file']))
@@ -1612,9 +1610,9 @@ public function displayError($code,$message,$file,$line)
 			echo "<p>$message ($file:$line)</p>\n";
 			echo '<pre>';
 			$trace=debug_backtrace();
-			// skip the first 3 stacks as they do not tell the error position
-			if(count($trace)>3)
-				$trace=array_slice($trace,3);
+			// skip the first 2 stacks as they are always irrelevant
+			if(count($trace)>2)
+				$trace=array_slice($trace,2);
 			foreach($trace as $i=>$t)
 			{
 				if(!isset($t['file']))