diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-05-26 10:47:20 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-05-26 10:47:20 +0000 |
| commit | 6826f8640d30a171bba5c0455878f341f5cd90c9 (patch) | |
| tree | 71782659a7e13e24e0b91756219a690d3f944007 | |
| parent | 680de534b026bb3b0dfcede57f773c00e300e4a8 (diff) | |
| download | brdo-6826f8640d30a171bba5c0455878f341f5cd90c9.tar.gz brdo-6826f8640d30a171bba5c0455878f341f5cd90c9.tar.bz2 | |
- Patch #730420 by andrewmacpherson: make html.tpl.php less dependant on rdf namespaces.
| -rw-r--r-- | includes/common.inc | 2 | ||||
| -rw-r--r-- | modules/system/html.tpl.php | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/includes/common.inc b/includes/common.inc index ed635e6c0..43661e524 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -262,7 +262,7 @@ function drupal_get_rdf_namespaces() { $xml_rdf_namespaces[] = 'xmlns:' . $prefix . '="' . $uri . '"'; } } - return implode("\n ", $xml_rdf_namespaces); + return count($xml_rdf_namespaces) ? "\n " . implode("\n ", $xml_rdf_namespaces) : ''; } /** diff --git a/modules/system/html.tpl.php b/modules/system/html.tpl.php index 727418a92..235b78fab 100644 --- a/modules/system/html.tpl.php +++ b/modules/system/html.tpl.php @@ -35,8 +35,7 @@ */ ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language->language; ?>" version="XHTML+RDFa 1.0" dir="<?php print $language->dir; ?>" - <?php print $rdf_namespaces; ?>> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language->language; ?>" version="XHTML+RDFa 1.0" dir="<?php print $language->dir; ?>"<?php print $rdf_namespaces; ?>> <head profile="<?php print $grddl_profile; ?>"> <?php print $head; ?> |