Merge Commit

This commit is contained in:
Virtuworks 2013-05-29 14:02:42 -04:00
commit 7b8b4ce9dc

View file

@ -418,7 +418,7 @@ class WebsitePanel
$esUrl = (($this->_esUseSsl ? "https" : "http") . "://{$this->_esServerUrl}:{$this->_esServerPort}/{$serviceFile}?WSDL");
$soapParams = array('login' => $this->_esUsername,
'password' => $this->_esPassword,
'cache_wsdl' => WSDL_CACHE_NONE, // WSDL caching is an annoying nightmare - we will disable it
'cache_wsdl' => WSDL_CACHE_NONE // WSDL caching is an annoying nightmare - we will disable it
);
try
{
@ -432,7 +432,7 @@ class WebsitePanel
}
catch (Exception $e)
{
throw;
throw new Exception($e->getMessage());
}
}
}