diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-03-17 14:04:38 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-03-17 14:04:38 +0000 |
| commit | 4474551713144a5176f784ac9a8348741d3c363c (patch) | |
| tree | 37aa5b4eebd165142ae1da08c035fb0239ec200f /includes | |
| parent | 40417f5a6fccdbc1d8f12b3ba8bd917baa87ed8a (diff) | |
| download | brdo-4474551713144a5176f784ac9a8348741d3c363c.tar.gz brdo-4474551713144a5176f784ac9a8348741d3c363c.tar.bz2 | |
- Patch #680422 by scor, grendzy, Heine: request_uri() can not be used as is in HTML.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/install.core.inc | 2 | ||||
| -rw-r--r-- | includes/theme.maintenance.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/includes/install.core.inc b/includes/install.core.inc index f67d790ca..3cf90636d 100644 --- a/includes/install.core.inc +++ b/includes/install.core.inc @@ -716,7 +716,7 @@ function install_verify_requirements(&$install_state) { if ($install_state['interactive']) { drupal_set_title(st('Requirements problem')); $status_report = theme('status_report', array('requirements' => $requirements)); - $status_report .= st('Check the error messages and <a href="!url">proceed with the installation</a>.', array('!url' => request_uri())); + $status_report .= st('Check the error messages and <a href="!url">proceed with the installation</a>.', array('!url' => check_url(request_uri()))); return $status_report; } else { diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc index c7b7ae0a7..1bfffa7ad 100644 --- a/includes/theme.maintenance.inc +++ b/includes/theme.maintenance.inc @@ -145,7 +145,7 @@ function theme_install_page($variables) { $title = count($messages['error']) > 1 ? st('The following errors must be resolved before you can continue the installation process') : st('The following error must be resolved before you can continue the installation process'); $variables['messages'] .= '<h3>' . $title . ':</h3>'; $variables['messages'] .= theme('status_messages', array('display' => 'error')); - $variables['content'] .= '<p>' . st('Check the error messages and <a href="!url">try again</a>.', array('!url' => request_uri())) . '</p>'; + $variables['content'] .= '<p>' . st('Check the error messages and <a href="!url">try again</a>.', array('!url' => check_url(request_uri()))) . '</p>'; } // Special handling of warning messages |