Index: template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/html5_base/template.php,v
retrieving revision 1.10
diff -u -p -r1.10 template.php
--- template.php 2 Nov 2010 15:24:38 -0000 1.10
+++ template.php 7 Feb 2011 17:16:30 -0000
@@ -15,15 +15,13 @@ if (theme_get_setting('html5_base_modern
drupal_add_js(drupal_get_path('theme', 'html5_base') .'/js/modernizr-1.5.min.js');
}
-/*
- * This function creates the body classes that are relative to each page
+/**
+ * Implements template_preprocess_page().
*
* @param $vars
* A sequential array of variables to pass to the theme template.
- * @param $hook
- * The name of the theme function being called ("page" in this case.)
*/
-function html5_base_preprocess_page(&$vars, $hook) {
+function html5_base_preprocess_page(&$vars) {
// Modernizr
// Add "no-js" class to if Modernizr is included
if (theme_get_setting('html5_base_modernizr')) {
@@ -31,12 +29,11 @@ function html5_base_preprocess_page(&$va
}
// Always force latest IE rendering engine (even in intranet) & Chrome Frame
if(theme_get_setting('html5_base_include_chrome_frame')){
- $vars['head'] = drupal_set_html_head('');
+ $vars['head'] .= drupal_set_html_head('');
}
- // dsm($vars);
// Mobile Viewport Fix
if (theme_get_setting('html5_base_use_mobile_viewport') && strlen(theme_get_setting('html5_base_mobile_viewport')) > 1) {
- $vars['head'] = drupal_set_html_head('');
+ $vars['head'] .= drupal_set_html_head('');
}
// Don't display empty help from node_help().
@@ -158,7 +155,7 @@ function html5_base_preprocess_page(&$va
* The name of the theme function being called ("node" in this case.)
*/
-function html5_base_preprocess_node(&$vars, $hook) {
+function html5_base_preprocess_node(&$vars) {
// Special classes for nodes
$classes = array('node');
if ($vars['sticky']) {