- Patch #680422 by scor, grendzy, Heine: request_uri() can not be used as is in HTML.

merge-requests/26/head
Dries Buytaert 2010-03-17 14:04:38 +00:00
parent 40417f5a6f
commit 4474551713
2 changed files with 2 additions and 2 deletions

View File

@ -716,7 +716,7 @@ function install_verify_requirements(&$install_state) {
if ($install_state['interactive']) { if ($install_state['interactive']) {
drupal_set_title(st('Requirements problem')); drupal_set_title(st('Requirements problem'));
$status_report = theme('status_report', array('requirements' => $requirements)); $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; return $status_report;
} }
else { else {

View File

@ -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'); $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'] .= '<h3>' . $title . ':</h3>';
$variables['messages'] .= theme('status_messages', array('display' => 'error')); $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 // Special handling of warning messages