Permalink
Browse files

Add fixes from Pantheon.

  • Loading branch information...
davidstrauss committed Dec 6, 2011
1 parent 6fa1723 commit 953e6608b34975eaa0c8abed8a90f80d22f1b967
Showing with 2 additions and 2 deletions.
  1. +2 −2 includes/bootstrap.inc
View
@@ -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 {

0 comments on commit 953e660

Please sign in to comment.