From 4474551713144a5176f784ac9a8348741d3c363c Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 17 Mar 2010 14:04:38 +0000
Subject: [PATCH] - Patch #680422 by scor, grendzy, Heine: request_uri() can
 not be used as is in HTML.

---
 includes/install.core.inc      | 2 +-
 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 f67d790cac2..3cf90636d7b 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 c7b7ae0a723..1bfffa7ad26 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