Add fixes from Pantheon.

pressflow · Dec 6, 2011 · 953e660 · 953e660
1 parent 6fa1723
commit 953e660
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
@@ -726,12 +726,12 @@ function drupal_settings_initialize() {
 
   // Load environmental config, if present.
   if (isset($_SERVER['PRESSFLOW_SETTINGS'])) {
-    $pressflow_settings = json_decode($_SERVER['PRESSFLOW_SETTINGS']);
+    $pressflow_settings = json_decode($_SERVER['PRESSFLOW_SETTINGS'], TRUE);
     foreach ($pressflow_settings as $key => $value) {
       // One level of depth should be enough for $conf and $database.
       if ($key == 'conf') {
         foreach($value as $conf_key => $conf_value) {
-          $conf[$conf_key] = $value;
+          $conf[$conf_key] = $conf_value;
         }
       }
       else {