Merge branch 'develop'

immense8342 · Feb 17, 2016 · ce8d385 · ce8d385
2 parents 275d941 + 28396c6
commit ce8d385
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/models/account.php b/models/account.php
@@ -39,7 +39,7 @@ class account_class extends AWS_MODEL
     public function check_username($user_name)
     {
     	$user_name = trim($user_name);
-    	
+
         return $this->fetch_one('users', 'uid', "user_name = '" . $this->quote($user_name) . "' OR url_token = '" . $this->quote($user_name) . "'");
     }
 
@@ -1411,7 +1411,7 @@ public function associate_remote_avatar($uid, $headimgurl)
             return false;
         }
 
-        if (!$avatar_stream = curl_get_contents($headimgurl, 1))
+        if (!$avatar_stream = file_get_contents($headimgurl))
         {
             return false;
         }

diff --git a/models/openid/weibo/weibo.php b/models/openid/weibo/weibo.php
@@ -216,7 +216,7 @@ public function get_msg_from_sina_crond()
 
                         $pic_url = 'http://' . implode('/', $pic_url_array);
 
-                        $result = curl_get_contents($pic_url);
+                        $result = file_get_contents($pic_url);
 
                         if (!$result)
                         {

diff --git a/models/openid/weixin/weixin.php b/models/openid/weixin/weixin.php
@@ -502,7 +502,7 @@ public function get_jsapi_ticket($access_token)
             return false;
         }
 
-        AWS_APP::cache()->set($cached_ticket, $result['ticket'], 60);
+        AWS_APP::cache()->set($cached_ticket, $result['ticket'], 3600);
 
         return $result['ticket'];
     }