aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash.costello@gmail.com>2011-10-01 11:33:06 -0400
committercash <cash.costello@gmail.com>2011-10-01 11:33:06 -0400
commit6b77c7de7a4b1c9d31236ccd7802bf9526cd1f41 (patch)
treefa5ebd2822814a798ba412bc9cfb2c15f1834e55
parentd44a060c8b9dbd94919bcf0edcb4f794da63d094 (diff)
downloadelgg-6b77c7de7a4b1c9d31236ccd7802bf9526cd1f41.tar.gz
elgg-6b77c7de7a4b1c9d31236ccd7802bf9526cd1f41.tar.bz2
Fixes #3826 using wwwroot in 1.8.x releases
-rw-r--r--engine/lib/configuration.php9
1 files changed, 1 insertions, 8 deletions
diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php
index b756d2e70..3a2364057 100644
--- a/engine/lib/configuration.php
+++ b/engine/lib/configuration.php
@@ -464,11 +464,6 @@ function get_config($name, $site_guid = 0) {
$dep_version = 1.8;
break;
- case 'wwwroot':
- $new_name = 'www_root';
- $dep_version = 1.8;
- break;
-
case 'sitename':
$new_name = 'site_name';
$dep_version = 1.8;
@@ -553,7 +548,7 @@ function set_default_config() {
'path' => "$install_root/",
'view_path' => "$install_root/views/",
'plugins_path' => "$install_root/mod/",
- 'www_root' => $www_root,
+ 'wwwroot' => $www_root,
'url' => $www_root,
'site_name' => 'New Elgg site',
'language' => 'en',
@@ -561,8 +556,6 @@ function set_default_config() {
// compatibility with old names for ppl not using get_config()
'viewpath' => "$install_root/views/",
'pluginspath' => "$install_root/mod/",
- 'wwwroot' => $www_root,
- 'url' => $www_root,
'sitename' => 'New Elgg site',
);