Merged in mcuiza/processmaker/PM-3366 (pull request #2723)

PM-3366
2015-09-04 14:23:06 -04:00
parent 0ba4fb8d2d 9d7a7ed7b4
commit 1ff106ed23
2 changed files with 7 additions and 7 deletions
--- a/workflow/engine/classes/class.system.php
+++ b/workflow/engine/classes/class.system.php
@@ -1181,7 +1181,8 @@ class System
        self::$debug = $config['debug'];

        if ($config['proxy_pass'] != '') {
-            $config['proxy_pass'] = G::decrypt($config['proxy_pass'], 'proxy_pass');
+            $G = new G();
+            $config['proxy_pass'] = $G->decrypt($config['proxy_pass'], 'proxy_pass');
        }

        return $config;