From 0bf124603d6a79f345d1a621ead16133aa866c68 Mon Sep 17 00:00:00 2001 From: Mathieu Lutfy Date: Sun, 31 Jan 2016 13:39:26 -0500 Subject: [PATCH] CRM-16801: revert seedLanguage fix in the installer. --- install/index.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/install/index.php b/install/index.php index 4dd397a9e7..fdd51caa11 100644 --- a/install/index.php +++ b/install/index.php @@ -134,9 +134,12 @@ global $tsLocale; $tsLocale = 'en_US'; $seedLanguage = 'en_US'; -if (isset($_GET['seedLanguage']) and isset($langs[$_GET['seedLanguage']])) { - $seedLanguage = $_GET['seedLanguage']; - $tsLocale = $_GET['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); -- 2.25.1