合并分支 'release-fangliyan' 到 'release'

test

查看合并请求 !23

center/controllers/login.php

@@ -16,14 +16,8 @@ class Login extends MY_Controller
     //登录页面
 	function index()
 	{
-		$ref_url = $_SERVER["HTTP_REFERER"];
-		$login_url = "http://passport.house365.com/index/login";
-		$login_url .= $login_url?('?others_returnback='.$ref_url):'';
-		if($_GET['ref']){
-			echo $login_url;exit;
-		}
         Header("HTTP/1.1 301 Moved Permanently");
-        Header("Location: $login_url");
+        Header("Location: http://passport.house365.com/index/login");
         exit;
         //IM 埋点
         if($_GET['from']=='im'){

center/controllers/user_fang.php

@@ -52,14 +52,11 @@ class User_Fang extends MY_Controller
     function __construct()
     {
       parent::__construct();
-        echo '1<br/>';
       $this->load->model("user_model");
-        echo '2<br/>';
       $this->load->model("broker_model");
 	  $this->load->model("pic_model");
 
 	  $this->load->model("block_model");
-        echo '3<br/>';
       $this->load->model("ask_model");
       $this->load->model("house_model");
       $this->load->model("house_statistic_model");
@@ -67,11 +64,9 @@ class User_Fang extends MY_Controller
       $this->load->model('rent_coupon_model');
       $this->load->library("user_class");
       $this->load->library("apply_class");
-        echo '4<br/>';
       $this->user_id = checklogin();
-        echo '5<br/>';
        if( $this->user_id <= 0 )
-       {echo '6<br/>';
+       {
             jumpto( USER_CENTER.'login');
             exit();
        }