summaryrefslogtreecommitdiffstats
path: root/sites
diff options
context:
space:
mode:
authorDries Buytaert2009-12-01 03:09:10 (GMT)
committerDries Buytaert2009-12-01 03:09:10 (GMT)
commit23acf0ebb30c7858f0f874f1ccdc0e54e631f419 (patch)
treea228ba6d8de30f7e4694b4dd6fd5325503f113c8 /sites
parentd8429228ce976650d4e5045b48f8f67871c38d63 (diff)
- Patch #647300 by sun: remove awkward array syntax from default.settings.php.
Diffstat (limited to 'sites')
-rw-r--r--sites/default/default.settings.php21
1 files changed, 13 insertions, 8 deletions
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index b3ce185..17190be 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -244,12 +244,16 @@ ini_set('session.cookie_lifetime', 2000000);
* these variable overrides will not be modifiable from the Drupal
* administration interface.
*
+ * The following overrides are examples:
+ * - site_name: Defines the site's name.
+ * - theme_default: Defines the default theme for this site.
+ * - anonymous: Defines the human-readable name of anonymous users.
* Remove the leading hash signs to enable.
*/
-$conf = array(
-# 'site_name' => 'My Drupal site',
-# 'theme_default' => 'minnelli',
-# 'anonymous' => 'Visitor',
+# $conf['site_name'] = 'My Drupal site';
+# $conf['theme_default'] = 'minnelli';
+# $conf['anonymous'] = 'Visitor';
+
/**
* A custom theme can be set for the offline page. This applies when the site
* is explicitly set to maintenance mode through the administration page or when
@@ -258,7 +262,8 @@ $conf = array(
* theme. It is located inside 'modules/system/maintenance-page.tpl.php'.
* Note: This setting does not apply to installation and update pages.
*/
-# 'maintenance_theme' => 'minnelli', // Leave the comma here.
+# $conf['maintenance_theme'] = 'minnelli';
+
/**
* reverse_proxy accepts a boolean value.
*
@@ -275,7 +280,8 @@ $conf = array(
* about this setting, do not have a reverse proxy, or Drupal operates in
* a shared hosting environment, this setting should remain commented out.
*/
-# 'reverse_proxy' => TRUE, // Leave the comma here.
+# $conf['reverse_proxy'] = TRUE;
+
/**
* reverse_proxy accepts an array of IP addresses.
*
@@ -286,8 +292,7 @@ $conf = array(
* reverse proxies. Otherwise, the client could directly connect to
* your web server spoofing the X-Forwarded-For headers.
*/
-# 'reverse_proxy_addresses' => array('a.b.c.d', ...), // Leave the comma here.
-);
+# $conf['reverse_proxy_addresses'] = array('a.b.c.d', ...);
/**
* Page caching: