Merge pull request #1 from liu21st/master

merge

Author: vus520

Extend/Behavior/CheckLangBehavior.class.php

@@ -53,7 +53,7 @@ private function checkLanguage() {
             }elseif(cookie('think_language')){// 获取上次用户的选择
                 $langSet = cookie('think_language');
             }elseif(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])){// 自动侦测浏览器语言
-                preg_match('/^([a-z\-]+)/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches);
+                preg_match('/^([a-z\d\-]+)/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches);
                 $langSet = $matches[1];
                 cookie('think_language',$langSet,3600);
             }
@@ -78,4 +78,4 @@ private function checkLanguage() {
         if (is_file($lang_path.$group.strtolower(MODULE_NAME).'.php'))
             L(include $lang_path.$group.strtolower(MODULE_NAME).'.php');
     }
-}
+}

Extend/Driver/Cache/CacheRedis.class.php

@@ -56,7 +56,9 @@ public function __construct($options=array()) {
      */
     public function get($name) {
         N('cache_read',1);
-        return $this->handler->get($this->options['prefix'].$name);
+        $value = $this->handler->get($this->options['prefix'].$name);
+        $jsonData  = json_decode( $value, true );
+        return ($jsonData === NULL) ? $value : $jsonData;	//检测是否为JSON数据 true 返回JSON解析数组, false返回源数据
     }
 
     /**
@@ -73,6 +75,8 @@ public function set($name, $value, $expire = null) {
             $expire  =  $this->options['expire'];
         }
         $name   =   $this->options['prefix'].$name;
+        //对数组/对象数据进行缓存处理，保证数据完整性
+        $value  =  (is_object($value) || is_array($value)) ? json_encode($value) : $value;
         if(is_int($expire)) {
             $result = $this->handler->setex($name, $expire, $value);
         }else{

Extend/Driver/Cache/CacheSqlite.class.php

@@ -75,7 +75,6 @@ public function get($name) {
      */
     public function set($name, $value,$expire=null) {
         N('cache_write',1);
-        $expire =  !empty($expireTime)? $expireTime : C('DATA_CACHE_TIME');
         $name  = $this->options['prefix'].sqlite_escape_string($name);
         $value = sqlite_escape_string(serialize($value));
         if(is_null($expire)) {

Extend/Driver/Db/DbIbase.class.php

@@ -299,7 +299,7 @@ public function close() {
      * @return string
      */
     public function error() {
-        $this->error = ibase_errmsg();
+        $this->error = ibase_errcode().':'.ibase_errmsg();
         if('' != $this->queryStr){
             $this->error .= "\n [ SQL语句 ] : ".$this->queryStr;
         }