Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#372563 by cytefx: Rename drupal_set_html_head() to drupal_ADD_html_head() which actually describes what it does.

merge-requests/26/head
Angie Byron 2009-04-15 23:49:08 +00:00
parent bb62eec3ce
commit cb3cde8be1
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/batch.inc
View File

@ -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);
}

6
includes/common.inc
View File

@ -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");
}
/**

2
includes/theme.inc
View File

@ -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.

2
includes/theme.maintenance.inc
View File

@ -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;

2
modules/system/system.module
View File

@ -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)" />');
}
/**