diff options
| -rw-r--r-- | includes/batch.inc | 2 | ||||
| -rw-r--r-- | includes/common.inc | 6 | ||||
| -rw-r--r-- | includes/theme.inc | 2 | ||||
| -rw-r--r-- | includes/theme.maintenance.inc | 2 | ||||
| -rw-r--r-- | modules/system/system.module | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/includes/batch.inc b/includes/batch.inc index 194b53db3..3622c0cb4 100644 --- a/includes/batch.inc +++ b/includes/batch.inc @@ -190,7 +190,7 @@ function _batch_progress_page_nojs() { } $url = url($batch['url'], array('query' => array('id' => $batch['id'], 'op' => $new_op))); - drupal_set_html_head('<meta http-equiv="Refresh" content="0; URL=' . $url . '">'); + drupal_add_html_head('<meta http-equiv="Refresh" content="0; URL=' . $url . '">'); return theme('progress_bar', $percentage, $message); } diff --git a/includes/common.inc b/includes/common.inc index f17256c67..9fe1ebe90 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -130,7 +130,7 @@ function drupal_get_rdf_namespaces() { * * This function can be called as long the headers aren't sent. */ -function drupal_set_html_head($data = NULL) { +function drupal_add_html_head($data = NULL) { static $stored_head = ''; if (!is_null($data)) { @@ -144,7 +144,7 @@ function drupal_set_html_head($data = NULL) { */ function drupal_get_html_head() { $output = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n"; - return $output . drupal_set_html_head(); + return $output . drupal_add_html_head(); } /** @@ -1972,7 +1972,7 @@ function base_path() { * This function can be called as long the HTML header hasn't been sent. */ function drupal_add_link($attributes) { - drupal_set_html_head('<link' . drupal_attributes($attributes) . " />\n"); + drupal_add_html_head('<link' . drupal_attributes($attributes) . " />\n"); } /** diff --git a/includes/theme.inc b/includes/theme.inc index 80f4c9003..6665ab861 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -1835,7 +1835,7 @@ function template_preprocess_page(&$variables) { // Add favicon. if (theme_get_setting('toggle_favicon')) { - drupal_set_html_head('<link rel="shortcut icon" href="' . check_url(theme_get_setting('favicon')) . '" type="image/x-icon" />'); + drupal_add_html_head('<link rel="shortcut icon" href="' . check_url(theme_get_setting('favicon')) . '" type="image/x-icon" />'); } // Set up layout variable. diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc index e88ebce93..02e4f492b 100644 --- a/includes/theme.maintenance.inc +++ b/includes/theme.maintenance.inc @@ -206,7 +206,7 @@ function theme_update_page($content, $show_messages = TRUE) { function template_preprocess_maintenance_page(&$variables) { // Add favicon if (theme_get_setting('toggle_favicon')) { - drupal_set_html_head('<link rel="shortcut icon" href="' . check_url(theme_get_setting('favicon')) . '" type="image/x-icon" />'); + drupal_add_html_head('<link rel="shortcut icon" href="' . check_url(theme_get_setting('favicon')) . '" type="image/x-icon" />'); } global $theme; diff --git a/modules/system/system.module b/modules/system/system.module index 62d99c1ad..7783c240a 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -2308,7 +2308,7 @@ function theme_system_compact_link() { * @ingroup themeable */ function theme_meta_generator_html($version = VERSION) { - drupal_set_html_head('<meta name="Generator" content="Drupal ' . $version . ' (http://drupal.org)" />'); + drupal_add_html_head('<meta name="Generator" content="Drupal ' . $version . ' (http://drupal.org)" />'); } /** |