Fix setting of initial config

frankkessler · Feb 26, 2016 · 1bb7ff9 · 1bb7ff9
1 parent 7692e09
commit 1bb7ff9
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/SalesforceConfig.php b/src/SalesforceConfig.php
@@ -38,9 +38,10 @@ public static function setInitialConfig($config=[])
     {
         if(!self::$config) {
             self::$config = self::getInitialConfig();
-            if ($config && !empty($config && is_array($config))) {
-                self::$config = array_replace(self::$config, $config);
-            }
+        }
+
+        if ($config && !empty($config) && is_array($config)) {
+            self::$config = array_replace(self::$config, $config);
         }
     }