Commit 0825a45f authored by Dave Reid's avatar Dave Reid

by Dave Reid: Replaced calls to xmlsitemap_var('base_url') with the native variable_get().

parent b1147f3b
......@@ -343,7 +343,7 @@ function xmlsitemap_settings_form() {
$form['advanced']['xmlsitemap_base_url'] = array(
'#type' => 'textfield',
'#title' => t('Default base URL'),
'#default_value' => xmlsitemap_var('base_url'),
'#default_value' => $GLOBALS['base_url'],
'#size' => 30,
'#description' => t('This is the default base URL used for sitemaps and sitemap links.'),
'#required' => TRUE,
......
......@@ -243,7 +243,7 @@ function xmlsitemap_generate_chunk(array $sitemap, $handle, &$status, $chunk) {
$url_options = xmlsitemap_get_url_options_from_context($sitemap['context']);
$url_options += array(
'absolute' => TRUE,
'base_url' => xmlsitemap_var('base_url'),
'base_url' => variable_get('xmlsitemap_base_url', $GLOBALS['base_url']),
'language' => language_default(),
'alias' => variable_get('xmlsitemap_prefetch_aliases', TRUE),
);
......@@ -330,7 +330,7 @@ function xmlsitemap_generate_index(array $sitemap, $handle, &$status) {
$url_options = xmlsitemap_get_url_options_from_context($sitemap['context']);
$url_options += array(
'absolute' => TRUE,
'base_url' => xmlsitemap_var('base_url'),
'base_url' => variable_get('xmlsitemap_base_url', $GLOBALS['base_url']),
'language' => language_default(),
'alias' => TRUE,
);
......
......@@ -160,7 +160,7 @@ function xmlsitemap_sitemap_uri(array $sitemap) {
$uri['options'] = module_invoke_all('xmlsitemap_context_url_options', $sitemap['context']);
$uri['options'] += array(
'absolute' => TRUE,
'base_url' => xmlsitemap_var('base_url'),
'base_url' => variable_get('xmlsitemap_base_url', $GLOBALS['base_url']),
);
return $uri;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment