Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.337.2.8
diff -u -p -r1.337.2.8 theme.inc
--- includes/theme.inc 30 Apr 2009 00:13:48 -0000 1.337.2.8
+++ includes/theme.inc 13 May 2009 19:46:33 -0000
@@ -170,7 +170,7 @@ function theme() {
if ($functions[$function]) {
$output = call_user_func_array($functions[$function], $args);
// Add final markup to the full page.
- if ($function == 'page') {
+ if ($function == 'page' || $function == 'book_export_html') {
$output = drupal_final_markup($output);
}
return $output;
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.406.2.1
diff -u -p -r1.406.2.1 book.module
--- modules/book/book.module 14 Feb 2007 04:30:33 -0000 1.406.2.1
+++ modules/book/book.module 13 May 2009 19:46:34 -0000
@@ -702,8 +702,9 @@ function theme_book_export_html($title,
global $base_url;
$html = "\n";
$html .= '';
- $html .= "\n". $title ."\n";
+ $html .= "\n\n";
$html .= '';
+ $html .= "\n". $title ."\n";
$html .= '' . "\n";
$html .= "\n";
$html .= "\n\n". $content ."\n\n\n";
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.330.2.18
diff -u -p -r1.330.2.18 taxonomy.module
--- modules/taxonomy/taxonomy.module 23 Feb 2009 05:42:20 -0000 1.330.2.18
+++ modules/taxonomy/taxonomy.module 13 May 2009 19:46:34 -0000
@@ -621,7 +621,7 @@ function taxonomy_term_confirm_delete_su
*/
function taxonomy_form($vid, $value = 0, $help = NULL, $name = 'taxonomy') {
$vocabulary = taxonomy_get_vocabulary($vid);
- $help = ($help) ? $help : $vocabulary->help;
+ $help = ($help) ? $help : filter_xss_admin($vocabulary->help);
if (!$vocabulary->multiple) {
$blank = ($vocabulary->required) ? t('- Please choose -') : t('- None selected -');
@@ -718,7 +718,7 @@ function taxonomy_form_alter($form_id, &
$typed_string = implode(', ', $typed_terms) . (array_key_exists('tags', $terms) ? $terms['tags'][$vocabulary->vid] : NULL);
if ($vocabulary->help) {
- $help = $vocabulary->help;
+ $help = filter_xss_admin($vocabulary->help);
}
else {
$help = t('A comma-separated list of terms describing this content. Example: funny, bungee jumping, "Company, Inc.".');
@@ -741,7 +741,7 @@ function taxonomy_form_alter($form_id, &
$default_terms[$term->tid] = $term;
}
}
- $form['taxonomy'][$vocabulary->vid] = taxonomy_form($vocabulary->vid, array_keys($default_terms), $vocabulary->help);
+ $form['taxonomy'][$vocabulary->vid] = taxonomy_form($vocabulary->vid, array_keys($default_terms), filter_xss_admin($vocabulary->help));
$form['taxonomy'][$vocabulary->vid]['#weight'] = $vocabulary->weight;
$form['taxonomy'][$vocabulary->vid]['#required'] = $vocabulary->required;
}