3.2.6

lightspeedretail · Apr 15, 2015 · 4698747 · 4698747
1 parent 33cb60b
commit 4698747
Show file tree

Hide file tree

Showing 88 changed files with 25,333 additions and 2,250 deletions.
diff --git a/core/framework/YiiBase.php b/core/framework/YiiBase.php
@@ -80,7 +80,7 @@ class YiiBase
 	 */
 	public static function getVersion()
 	{
-		return '1.1.14';
+		return '1.1.15';
 	}
 
 	/**

diff --git a/core/framework/base/CModel.php b/core/framework/base/CModel.php
@@ -16,7 +16,7 @@
  *
  * @property CList $validatorList All the validators declared in the model.
  * @property array $validators The validators applicable to the current {@link scenario}.
- * @property array $_errors Errors for all attributes or the specified attribute. Empty array is returned if no error.
+ * @property array $errors Errors for all attributes or the specified attribute. Empty array is returned if no error.
  * @property array $attributes Attribute values (name=>value).
  * @property string $scenario The scenario that this model is in.
  * @property array $safeAttributeNames Safe attribute names.

diff --git a/core/framework/web/CHttpRequest.php b/core/framework/web/CHttpRequest.php
@@ -951,7 +951,7 @@ public function getPreferredLanguages()
 	{
 		if($this->_preferredLanguages===null)
 		{
-			$sortedLanguages=array('en');
+			$sortedLanguages=array();
 			if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && $n=preg_match_all('/([\w\-_]+)(?:\s*;\s*q\s*=\s*(\d*\.?\d*))?/',$_SERVER['HTTP_ACCEPT_LANGUAGE'],$matches))
 			{
 				$languages=array();

diff --git a/core/framework/yii.php b/core/framework/yii.php
@@ -24,10 +24,10 @@
  */
 class Yii extends YiiBase
 {
-	public static function createWebApplication($config=null)
-	{
-		$wsbootstrap=dirname(__FILE__).'/../protected/components/WsWebApplication.php';
-		require_once($wsbootstrap);
-		return self::createApplication('WsWebApplication',$config);
-	}
+       public static function createWebApplication($config=null)
+       {
+               $wsbootstrap=dirname(__FILE__) . '/../protected/components/WsWebApplication.php';
+               require_once($wsbootstrap);
+               return self::createApplication('WsWebApplication', $config);
+       }
 }