Commit 740e6a23 authored by Raph El's avatar Raph El
Browse files

Merge branch 'qa' into development

parents 0f12409f 241954df
......@@ -148,9 +148,10 @@ class ApiController extends Controller
//managed public and private sections through a url manager
$page = $this->pages[Yii::app()->controller->id][Yii::app()->controller->action->id];
if( isset( $_POST["X-Auth-Token"]) && Authorisation::isMeteorConnected( $_POST["X-Auth-Token"] ) ){
$headers = getallheaders();
if( isset($headers["X-Auth-Token"]) && isset($headers["X-User-Id"]) && isset($headers["X-Auth-Name"]) && Authorisation::isMeteorConnected( $headers["X-Auth-Token"], $headers["X-User-Id"], $headers["X-Auth-Name"] ) ){
$prepareData = false;
}
}
CornerDev::addWorkLog("communecter","you@dev.com",Yii::app()->controller->id,Yii::app()->controller->action->id);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment