Merge pull request #689 from julceslauhub/master

Improvement in the proxy settings
This commit is contained in:
julceslauhub
2012-10-08 15:22:02 -07:00
2 changed files with 1 additions and 5 deletions

View File

@@ -3390,7 +3390,7 @@ class Processes {
}
$client = @new SoapClient($endpoint, $proxy);
} catch (Exception $e) {
throw ( new Exception ( $e->message ) );
throw ( new Exception ( $e->getMessage() ) );
}

View File

@@ -1010,10 +1010,6 @@ class System {
if ($_SESSION['PROCESSMAKER_ENV_HASH'] === $hash) {
$_SESSION['PROCESSMAKER_ENV']['from_cache'] = 1;
if (!isset($_SESSION['PROCESSMAKER_ENV']['proxy_pass'])) {
$_SESSION['PROCESSMAKER_ENV']['proxy_pass'] = '';
}
$_SESSION['PROCESSMAKER_ENV']['proxy_pass'] = G::decrypt($_SESSION['PROCESSMAKER_ENV']['proxy_pass'], 'proxy_pass');
return $_SESSION['PROCESSMAKER_ENV'];
}
}