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

diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php
index e8220ff45e6946e3e097560fc0f70ff49dbdf772..0ed081a9aaaeb8aa5c200fd9963717fabb1b713f 100644 (file)
--- 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 a79b8ebe65ddd068079434237c86d6752c67375f..02555c7d350c5115c90b2664add17c6642919925 100644 (file)
--- 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: