Merge branch 'master' into qa

controllers/RocketchatController.php

@@ -78,9 +78,11 @@ class RocketchatController extends CommunecterController {
 		    
 
 		    if(!@Yii::app()->session["loginToken"]){
+				if(isset($email) && isset($pwd)){
 				$rocket = RocketChat::getToken( $email, $pwd );
 				Yii::app()->session["loginToken"] = $rocket["loginToken"];
-			  	Yii::app()->session["rocketUserId"] = $rocket["rocketUserId"];
+				Yii::app()->session["rocketUserId"] = $rocket["rocketUserId"];
+				}
 			  }
 		  	$rocket["loginToken"] = Yii::app()->session["loginToken"];
 		    $rocket["rocketUserId"] = Yii::app()->session["rocketUserId"];