@@ -41,7 +41,7 @@ class YiiBase
41
41
private static $ _logger ;
42
42
public static function getVersion ()
43
43
{
44
- return '1.1.21-dev ' ;
44
+ return '1.1.21 ' ;
45
45
}
46
46
public static function createWebApplication ($ config =null )
47
47
{
@@ -2805,6 +2805,13 @@ public function getPreferredAcceptType()
2805
2805
$ preferredAcceptTypes =$ this ->getPreferredAcceptTypes ();
2806
2806
return empty ($ preferredAcceptTypes ) ? false : $ preferredAcceptTypes [0 ];
2807
2807
}
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
+ }
2808
2815
public function getPreferredLanguages ()
2809
2816
{
2810
2817
if ($ this ->_preferredLanguages ===null )
@@ -2821,7 +2828,7 @@ public function getPreferredLanguages()
2821
2828
if ($ q )
2822
2829
$ languages []=array ((float )$ q ,$ matches [1 ][$ i ]);
2823
2830
}
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 ' ));
2825
2832
foreach ($ languages as $ language )
2826
2833
$ sortedLanguages []=$ language [1 ];
2827
2834
}
@@ -4680,10 +4687,12 @@ public function setCookieParams($value)
4680
4687
$ data =session_get_cookie_params ();
4681
4688
extract ($ data );
4682
4689
extract ($ value );
4690
+ $ this ->freeze ();
4683
4691
if (isset ($ httponly ))
4684
4692
session_set_cookie_params ($ lifetime ,$ path ,$ domain ,$ secure ,$ httponly );
4685
4693
else
4686
4694
session_set_cookie_params ($ lifetime ,$ path ,$ domain ,$ secure );
4695
+ $ this ->unfreeze ();
4687
4696
}
4688
4697
public function getCookieMode ()
4689
4698
{
@@ -4744,15 +4753,19 @@ public function getUseTransparentSessionID()
4744
4753
}
4745
4754
public function setUseTransparentSessionID ($ value )
4746
4755
{
4756
+ $ this ->freeze ();
4747
4757
ini_set ('session.use_trans_sid ' ,$ value ?'1 ' :'0 ' );
4758
+ $ this ->unfreeze ();
4748
4759
}
4749
4760
public function getTimeout ()
4750
4761
{
4751
4762
return (int )ini_get ('session.gc_maxlifetime ' );
4752
4763
}
4753
4764
public function setTimeout ($ value )
4754
4765
{
4766
+ $ this ->freeze ();
4755
4767
ini_set ('session.gc_maxlifetime ' ,$ value );
4768
+ $ this ->unfreeze ();
4756
4769
}
4757
4770
public function openSession ($ savePath ,$ sessionName )
4758
4771
{
@@ -10727,4 +10740,4 @@ interface ILogFilter
10727
10740
{
10728
10741
public function filter (&$ logs );
10729
10742
}
10730
- ?>
10743
+ ?>
0 commit comments