[gh-70] Merging from testing into staging

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@434 20a16fea-79d4-4915-8869-1ea9d5ebf173

[gh-70] Merging from testing into staging
792a3815 · Tim Steiner · 213f7e81 · 792a3815
Commit 792a3815 authored 14 years ago by Tim Steiner
--- a/sites/all/themes/unl_wdn/html.tpl.php
+++ b/sites/all/themes/unl_wdn/html.tpl.php
@@ -34,6 +34,12 @@

 $t = unl_wdn_get_instance();

+if (theme_get_setting('use_base')) {
+    $t->head = PHP_EOL
+             . '<base href="' . url('<front>', array('absolute' => TRUE)) . '" />' . PHP_EOL
+             . $t->head;
+}
+
 $t->head .= PHP_EOL
          . $head . PHP_EOL
          . $styles . PHP_EOL
@@ -44,9 +50,6 @@ $t->head .= PHP_EOL
          . theme_get_setting('head_html') . PHP_EOL
          ;

-if (theme_get_setting('use_base')) {
-	$t->head .= '<base href="' . url('<front>', array('absolute' => TRUE)) . '" />' . PHP_EOL;
-}

 $t->doctitle = '<title>'.$head_title.'</title>';

@@ -54,7 +57,7 @@ $html = $t->toHtml();

 if (module_exists('rdf')) {
  $html = strtr($html, array(
-  	'<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">' => '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="'.$language->language.'" version="XHTML+RDFa 1.0" dir="'.$language->dir.'" '.$rdf_namespaces.'>',
+    '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">' => '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="'.$language->language.'" version="XHTML+RDFa 1.0" dir="'.$language->dir.'" '.$rdf_namespaces.'>',
    '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">',
    '<head>' => '<head profile="'.$grddl_profile.'">',
  ));