From: Mathieu Lutfy <mathieu@bidon.ca>
Date: Sun, 31 Jan 2016 18:39:26 +0000 (-0500)
Subject: CRM-16801: revert seedLanguage fix in the installer.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5f6b3b5da9776f7b7e33dd7ca8ee6c5b0f0a3be6;p=civicrm-core.git

CRM-16801: revert seedLanguage fix in the installer.
---

diff --git a/install/index.php b/install/index.php
index adc88051ae..4502e5de53 100644
--- a/install/index.php
+++ b/install/index.php
@@ -174,9 +174,12 @@ global $tsLocale;
 $tsLocale = 'en_US';
 $seedLanguage = 'en_US';
 
-if (isset($_POST['seedLanguage']) and isset($langs[$_POST['seedLanguage']])) {
-  $seedLanguage = $_POST['seedLanguage'];
-  $tsLocale = $_POST['seedLanguage'];
+// CRM-16801 This validates that seedLanguage is valid by looking in $langs.
+// NB: the variable is initial a $_REQUEST for the initial page reload,
+// then becomes a $_POST when the installation form is submitted.
+if (isset($_REQUEST['seedLanguage']) and isset($langs[$_REQUEST['seedLanguage']])) {
+  $seedLanguage = $_REQUEST['seedLanguage'];
+  $tsLocale = $_REQUEST['seedLanguage'];
 }
 
 $config = CRM_Core_Config::singleton(FALSE);