diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-04-11 18:33:44 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-04-11 18:33:44 +0000 |
| commit | ff301288f2ea06d76606c05bccac5957e2873a94 (patch) | |
| tree | b46d9d7e56612945850281a136161967ba8bc5f2 /includes/install.core.inc | |
| parent | de33f74b4040cc3f7880269152b277d90b081cc8 (diff) | |
| download | brdo-ff301288f2ea06d76606c05bccac5957e2873a94.tar.gz brdo-ff301288f2ea06d76606c05bccac5957e2873a94.tar.bz2 | |
- Patch #348448 by mfb, c960657, marvil07, cdale, jpmckinney: fixed PHP strict warnings when running tests and for PHP 5.3.
Diffstat (limited to 'includes/install.core.inc')
| -rw-r--r-- | includes/install.core.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/includes/install.core.inc b/includes/install.core.inc index 2ddcac495..6126e7a1a 100644 --- a/includes/install.core.inc +++ b/includes/install.core.inc @@ -1204,7 +1204,8 @@ function install_select_locale(&$install_state) { } else { include_once DRUPAL_ROOT . '/includes/form.inc'; - $output = drupal_render(drupal_get_form('install_select_locale_form', $locales, $profilename)); + $elements = drupal_get_form('install_select_locale_form', $locales, $profilename); + $output = drupal_render($elements); } return $output; } @@ -1237,7 +1238,8 @@ function install_select_locale(&$install_state) { if ($install_state['interactive']) { drupal_set_title(st('Choose language')); include_once DRUPAL_ROOT . '/includes/form.inc'; - return drupal_render(drupal_get_form('install_select_locale_form', $locales, $profilename)); + $elements = drupal_get_form('install_select_locale_form', $locales, $profilename); + return drupal_render($elements); } else { throw new Exception(st('Sorry, you must select a language to continue the installation.')); |