From 67d2a2ffc4765223ffdb61b4b099efa572a62360 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Mon, 10 Sep 2012 14:50:02 +0100
Subject: [PATCH] Revert "Issue #1772708 by alexpott: Fixed The configuration
 directories can not be outside of DRUPAL_ROOT."

This reverts commit e003e4c580c05b8aa6f05b9331d5013c8b05d211.
---
 core/includes/bootstrap.inc                            |  8 +-------
 core/includes/install.inc                              |  8 ++------
 .../simpletest/lib/Drupal/simpletest/TestBase.php      |  6 +++---
 sites/default/default.settings.php                     | 10 ++--------
 4 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index d9969c93d275..906a7c145bb9 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -508,13 +508,7 @@ function config_get_config_directory($type = CONFIG_ACTIVE_DIRECTORY) {
     $path = conf_path() . '/files/simpletest/' . substr($test_prefix, 10) . '/config_' . $type;
   }
   elseif (!empty($config_directories[$type])) {
-    // Allow a configuration directory path to be outside of webroot.
-    if (empty($config_directories[$type]['absolute'])) {
-      $path = conf_path() . '/files/' . $config_directories[$type]['path'];
-    }
-    else {
-      $path = $config_directories[$type]['path'];
-    }
+    $path = conf_path() . '/files/' . $config_directories[$type];
   }
   else {
     throw new Exception(format_string('The configuration directory type %type does not exist.', array('%type' => $type)));
diff --git a/core/includes/install.inc b/core/includes/install.inc
index efba3c15826d..330fc0e193e7 100644
--- a/core/includes/install.inc
+++ b/core/includes/install.inc
@@ -266,12 +266,8 @@ function drupal_install_config_directories() {
   if (empty($config_directories)) {
     $settings['config_directories'] = array(
       'value' => array(
-        CONFIG_ACTIVE_DIRECTORY => array(
-          'path' => 'config/active_' . drupal_hash_base64(drupal_random_bytes(55)),
-        ),
-        CONFIG_STAGING_DIRECTORY => array(
-          'path' => 'config/staging_' . drupal_hash_base64(drupal_random_bytes(55)),
-        ),
+        CONFIG_ACTIVE_DIRECTORY => 'config/active_' . drupal_hash_base64(drupal_random_bytes(55)),
+        CONFIG_STAGING_DIRECTORY => 'config/staging_' . drupal_hash_base64(drupal_random_bytes(55)),
       ),
       'required' => TRUE,
     );
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
index 095981e6c62f..6f17f57da368 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
@@ -727,7 +727,7 @@ abstract class TestBase {
     // @see config_get_config_directory()
     $GLOBALS['config_directories'] = array();
     foreach (array(CONFIG_ACTIVE_DIRECTORY, CONFIG_STAGING_DIRECTORY) as $type) {
-      $GLOBALS['config_directories'][$type]['path'] = 'simpletest/' . substr($this->databasePrefix, 10) . '/config_' . $type;
+      $GLOBALS['config_directories'][$type] = 'simpletest/' . substr($this->databasePrefix, 10) . '/config_' . $type;
     }
 
     // Reset and create a new service container.
@@ -735,11 +735,11 @@ abstract class TestBase {
 
     $this->configDirectories = array();
     include_once DRUPAL_ROOT . '/core/includes/install.inc';
-    foreach ($GLOBALS['config_directories'] as $type => $directory) {
+    foreach ($GLOBALS['config_directories'] as $type => $path) {
       if (!install_ensure_config_directory($type)) {
         return FALSE;
       }
-      $this->configDirectories[$type] = $this->originalFileDirectory . '/' . $directory['path'];
+      $this->configDirectories[$type] = $this->originalFileDirectory . '/' . $path;
     }
 
     // Unset globals.
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index 8e95dba25f62..7010b6a2ff4c 100755
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -259,14 +259,8 @@ $drupal_hash_salt = '';
  * Example:
  * @code
  *   $config_directories = array(
- *     CONFIG_ACTIVE_DIRECTORY => array(
- *       'path' => '/some/directory/outside/webroot',
- *       'absolute' => TRUE,
- *     ),
- *     CONFIG_STAGING_DIRECTORY => array(
- *       'path' => '/another/directory/outside/webroot',
- *       'absolute' => TRUE,
- *     ),
+ *     CONFIG_ACTIVE_DIRECTORY => '/some/directory/outside/webroot',
+ *     CONFIG_STAGING_DIRECTORY => '/another/directory/outside/webroot',
  *   );
  * @endcode
  */