Add fixes from Pantheon.

davidstrauss · davidstrauss · commit 953e6608b349 · 2011-12-06T12:34:18.000-08:00
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 {

Original file line number	Diff line number	Diff line change
`@@ -726,12 +726,12 @@ function drupal_settings_initialize() {`
`726`	`726`
`727`	`727`	`// Load environmental config, if present.`
`728`	`728`	`if (isset($_SERVER['PRESSFLOW_SETTINGS'])) {`
`729`		`- $pressflow_settings = json_decode($_SERVER['PRESSFLOW_SETTINGS']);`
	`729`	`+ $pressflow_settings = json_decode($_SERVER['PRESSFLOW_SETTINGS'], TRUE);`
`730`	`730`	`foreach ($pressflow_settings as $key => $value) {`
`731`	`731`	`// One level of depth should be enough for $conf and $database.`
`732`	`732`	`if ($key == 'conf') {`
`733`	`733`	`foreach($value as $conf_key => $conf_value) {`
`734`		`- $conf[$conf_key] = $value;`
	`734`	`+ $conf[$conf_key] = $conf_value;`
`735`	`735`	`}`
`736`	`736`	`}`
`737`	`737`	`else {`