Merge branch 'feature-lq-04' into release_0415

new_admincp/applications/models/broker_base_model.php

@@ -104,7 +104,7 @@ class Broker_base_model extends MY_Model {
     * @param	void
     * @return	array   经纪人基础信息
     */
-    public function get_broker_info()
+    public function get_broker_info($cacheFlag)
     {   
         if($this->check_uid())
         {	
@@ -113,7 +113,7 @@ class Broker_base_model extends MY_Model {
 			$cache = $this->mc->delete($mem_key);
             $cache = $this->mc->get($mem_key);
 			
-            if(isset($cache['is_ok']) && $cache['is_ok'] == 1 )
+            if(isset($cache['is_ok']) && $cache['is_ok'] == 1 && $cacheFlag)
             {
                 $arr_data = $cache['data'];
             }
@@ -155,10 +155,10 @@ class Broker_base_model extends MY_Model {
      * @param void
      * @return array
      */
-    public function get_broker_detail()
+    public function get_broker_detail($cacheFlag = true)
     {	
         $arr_data = array();
-        $arr_data = $this->get_broker_info();
+        $arr_data = $this->get_broker_info($cacheFlag);
 
         return $arr_data;
     }

new_admincp/applications/zsb/controllers/ucenter_information.php

@@ -513,7 +513,7 @@ class ucenter_information extends MY_Controller{
 	$oldpassword = $this->encrypt_pwd($oldpwd);
 	$newpassword = $this->encrypt_pwd($newpwd);
         $this->broker_model->set_uid($session_info['uid']);
-        $broker_info = $this->broker_model->get_broker_detail();
+        $broker_info = $this->broker_model->get_broker_detail(false);
         
 	$oldpwd = $broker_info['password'];
 	if($oldpassword == $oldpwd){