aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-12 22:37:08 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-12 22:37:08 +0000
commitea320e206be4f99c9a5819306ec1b284b1085ed4 (patch)
tree71c509663c3040a038bd4eb249b708537f180691
parent1a6bc7aaf9b255eb8dabcc102d4f516e050cd4c0 (diff)
downloadelgg-ea320e206be4f99c9a5819306ec1b284b1085ed4.tar.gz
elgg-ea320e206be4f99c9a5819306ec1b284b1085ed4.tar.bz2
Fixes #2312 - checking value of arg_separator.output during install
git-svn-id: http://code.elgg.org/elgg/trunk@7066 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--install/ElggInstaller.php9
-rw-r--r--install/languages/en.php1
2 files changed, 10 insertions, 0 deletions
diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php
index e8220ff45..0ed081a9a 100644
--- a/install/ElggInstaller.php
+++ b/install/ElggInstaller.php
@@ -864,6 +864,15 @@ class ElggInstaller {
'message' => elgg_echo("install:check:php:safe_mode")
);
}
+
+ if (ini_get('arg_separator.output') !== '&') {
+ $separator = htmlspecialchars(ini_get('arg_separator.output'));
+ $msg = sprintf(elgg_echo("install:check:php:arg_separator"), $separator);
+ $phpReport[] = array(
+ 'severity' => 'failure',
+ 'message' => $msg,
+ );
+ }
}
/**
diff --git a/install/languages/en.php b/install/languages/en.php
index a79b8ebe6..02555c7d3 100644
--- a/install/languages/en.php
+++ b/install/languages/en.php
@@ -40,6 +40,7 @@ If you are ready to proceed, click the Next button.",
'install:check:php:extension:recommend' => 'It is recommended that the PHP extension %s is installed.',
'install:check:php:open_basedir' => 'The open_basedir PHP directive may prevent Elgg from saving files to its data directory.',
'install:check:php:safe_mode' => 'Running PHP in safe mode is not recommened and may cause problems with Elgg.',
+ 'install:check:php:arg_separator' => 'arg_separator.output must be & for Elgg to work and your server\'s value is %s ',
'install:check:enginedir' => 'Your web server does not have permission to create the settings.php file in the engine directory. You have two choices: