Skip to content

Commit a5ab20c

Browse files
committed
Release version 1.1.24
1 parent 40c4409 commit a5ab20c

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

CHANGELOG

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
 Yii Framework Change Log
22
========================
33

4-
Version 1.1.24 under development
4+
Version 1.1.24 June 7, 2021
55
--------------------------------
66

77
- Bug #4339: "There is no active transaction" when transaction is autocommitted (twisted1919)

framework/YiiBase.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class YiiBase
8787
*/
8888
public static function getVersion()
8989
{
90-
return '1.1.24-dev';
90+
return '1.1.24';
9191
}
9292

9393
/**

framework/yiilite.php

+5-7
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class YiiBase
4141
private static $_logger;
4242
public static function getVersion()
4343
{
44-
return '1.1.24-dev';
44+
return '1.1.24';
4545
}
4646
public static function createWebApplication($config=null)
4747
{
@@ -1542,9 +1542,7 @@ public function handleError($code,$message,$file,$line)
15421542
restore_exception_handler();
15431543
$log="$message ($file:$line)\nStack trace:\n";
15441544
$trace=debug_backtrace();
1545-
// skip the first 3 stacks as they do not tell the error position
1546-
if(count($trace)>3)
1547-
$trace=array_slice($trace,3);
1545+
array_shift($trace);
15481546
foreach($trace as $i=>$t)
15491547
{
15501548
if(!isset($t['file']))
@@ -1612,9 +1610,9 @@ public function displayError($code,$message,$file,$line)
16121610
echo "<p>$message ($file:$line)</p>\n";
16131611
echo '<pre>';
16141612
$trace=debug_backtrace();
1615-
// skip the first 3 stacks as they do not tell the error position
1616-
if(count($trace)>3)
1617-
$trace=array_slice($trace,3);
1613+
// skip the first 2 stacks as they are always irrelevant
1614+
if(count($trace)>2)
1615+
$trace=array_slice($trace,2);
16181616
foreach($trace as $i=>$t)
16191617
{
16201618
if(!isset($t['file']))

0 commit comments

Comments
 (0)