Skip to content

Commit 733ac58

Browse files
committed
release version 1.1.21
1 parent 0f136db commit 733ac58

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

CHANGELOG

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

4-
Version 1.1.21 under development
5-
--------------------------------
4+
Version 1.1.21 April 2, 2019
5+
----------------------------
66

77
- Bug #4220: Fixed PHP 7.2 incompatibility caused by the use of `create_function` in CHttpRequest and CProfileLogRoute (martinpetrasch, freezy-sk)
88
- Bug #4229: Remove deprecation errors from framework/web/js/source/jquery.yiiactiveform.js when using jQuery 3.1.1 (kenguest)

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.21-dev';
90+
return '1.1.21';
9191
}
9292

9393
/**

framework/yiilite.php

+16-3
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.21-dev';
44+
return '1.1.21';
4545
}
4646
public static function createWebApplication($config=null)
4747
{
@@ -2805,6 +2805,13 @@ public function getPreferredAcceptType()
28052805
$preferredAcceptTypes=$this->getPreferredAcceptTypes();
28062806
return empty($preferredAcceptTypes) ? false : $preferredAcceptTypes[0];
28072807
}
2808+
private function stringCompare($a, $b)
2809+
{
2810+
if ($a[0] == $b[0]) {
2811+
return 0;
2812+
}
2813+
return ($a[0] < $b[0]) ? 1 : -1;
2814+
}
28082815
public function getPreferredLanguages()
28092816
{
28102817
if($this->_preferredLanguages===null)
@@ -2821,7 +2828,7 @@ public function getPreferredLanguages()
28212828
if($q)
28222829
$languages[]=array((float)$q,$matches[1][$i]);
28232830
}
2824-
usort($languages,create_function('$a,$b','if($a[0]==$b[0]) {return 0;} return ($a[0]<$b[0]) ? 1 : -1;'));
2831+
usort($languages, array($this, 'stringCompare'));
28252832
foreach($languages as $language)
28262833
$sortedLanguages[]=$language[1];
28272834
}
@@ -4680,10 +4687,12 @@ public function setCookieParams($value)
46804687
$data=session_get_cookie_params();
46814688
extract($data);
46824689
extract($value);
4690+
$this->freeze();
46834691
if(isset($httponly))
46844692
session_set_cookie_params($lifetime,$path,$domain,$secure,$httponly);
46854693
else
46864694
session_set_cookie_params($lifetime,$path,$domain,$secure);
4695+
$this->unfreeze();
46874696
}
46884697
public function getCookieMode()
46894698
{
@@ -4744,15 +4753,19 @@ public function getUseTransparentSessionID()
47444753
}
47454754
public function setUseTransparentSessionID($value)
47464755
{
4756+
$this->freeze();
47474757
ini_set('session.use_trans_sid',$value?'1':'0');
4758+
$this->unfreeze();
47484759
}
47494760
public function getTimeout()
47504761
{
47514762
return (int)ini_get('session.gc_maxlifetime');
47524763
}
47534764
public function setTimeout($value)
47544765
{
4766+
$this->freeze();
47554767
ini_set('session.gc_maxlifetime',$value);
4768+
$this->unfreeze();
47564769
}
47574770
public function openSession($savePath,$sessionName)
47584771
{
@@ -10727,4 +10740,4 @@ interface ILogFilter
1072710740
{
1072810741
public function filter(&$logs);
1072910742
}
10730-
?>
10743+
?>

0 commit comments

Comments
 (0)