* Fix bug #38385.
This commit is contained in:
@@ -137,8 +137,7 @@ class instance extends control
|
||||
{
|
||||
$url = strstr(getWebRoot(true), ':', true) . '://' . $instance->domain;
|
||||
$pipeline = $this->loadModel('pipeline')->getByUrl($url);
|
||||
$instance->externalID = $pipeline->id;
|
||||
|
||||
$instance->externalID = !empty($pipeline) ? $pipeline->id : 0;
|
||||
}
|
||||
|
||||
$this->view->title = $instance->appName;
|
||||
|
||||
@@ -41,7 +41,7 @@ class instanceZen extends instance
|
||||
$pipeline->token = zget($tempMappings, 'api_token', '');
|
||||
$pipeline->account = zget($tempMappings, 'z_username', '');
|
||||
$pipeline->password = zget($tempMappings, 'z_password', '');
|
||||
if($instance->appID === 60) $pipeline->token = base64_encode($pipeline->token . ':');
|
||||
if($instance->appID == 60) $pipeline->token = base64_encode($pipeline->token . ':');
|
||||
if(empty($pipeline->account)) $pipeline->account = zget($tempMappings, 'admin_username', '');
|
||||
|
||||
$this->pipeline->create($pipeline);
|
||||
|
||||
Reference in New Issue
Block a user