Skip to content

Commit

Permalink
Release version 1.1.24
Browse files Browse the repository at this point in the history
  • Loading branch information
marcovtwout committed Jun 7, 2021
1 parent 40c4409 commit a5ab20c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion framework/YiiBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class YiiBase
*/
public static function getVersion()
{
return '1.1.24-dev';
return '1.1.24';
}

/**
Expand Down
12 changes: 5 additions & 7 deletions framework/yiilite.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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']))
Expand Down Expand Up @@ -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']))
Expand Down

0 comments on commit a5ab20c

Please sign in to comment.