? _13148_base.patch
? files
? modules/api
? modules/devel
? modules/flexinode
? modules/game
? sites/morbus.totalnetnh.net.drupal
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.512
diff -u -p -r1.512 common.inc
--- includes/common.inc 29 Jan 2006 07:36:29 -0000 1.512
+++ includes/common.inc 1 Feb 2006 22:41:33 -0000
@@ -114,11 +114,8 @@ function drupal_set_html_head($data = NU
* Retrieve output to be displayed in the head tag of the HTML page.
*/
function drupal_get_html_head() {
- global $base_path;
-
$output = "\n";
- $output .= theme('stylesheet_import', $base_path .'misc/drupal.css');
-
+ $output .= theme('stylesheet_import', base_path() .'misc/drupal.css');
return $output . drupal_set_html_head();
}
@@ -237,7 +234,6 @@ function drupal_goto($path = '', $query
exit();
}
-
/**
* Generates a site off-line message
*/
@@ -918,7 +914,7 @@ function url($path = NULL, $query = NULL
return $path . $fragment;
}
- global $base_url, $base_path;
+ global $base_url;
static $script;
static $clean_url;
@@ -934,7 +930,7 @@ function url($path = NULL, $query = NULL
$clean_url = (bool)variable_get('clean_url', '0');
}
- $base = ($absolute ? $base_url . '/' : $base_path);
+ $base = ($absolute ? $base_url . '/' : base_path());
// The special path '' links to the default front page.
if (isset($path) && $path != '') {
@@ -1111,6 +1107,14 @@ function drupal_get_path($type, $name) {
}
/**
+ * Returns the base URL path of the Drupal installation.
+ * At the very least, this will always default to /.
+ */
+function base_path() {
+ return $GLOBALS['base_path'];
+}
+
+/**
* Provide a substitute clone() function for PHP4.
*/
function drupal_clone($object) {
@@ -1124,7 +1128,6 @@ function drupal_add_link($attributes) {
drupal_set_html_head('\n");
}
-
/**
* Add a JavaScript file to the output.
*
@@ -1133,15 +1136,14 @@ function drupal_add_link($attributes) {
* depends on the 'killswitch' inside it.
*/
function drupal_add_js($file) {
- global $base_path;
static $sent = array();
if (!isset($sent['misc/drupal.js'])) {
- drupal_set_html_head('');
+ drupal_set_html_head('');
$sent['misc/drupal.js'] = true;
}
if (!isset($sent[$file])) {
- drupal_set_html_head('');
+ drupal_set_html_head('');
$sent[$file] = true;
}
}
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.281
diff -u -p -r1.281 theme.inc
--- includes/theme.inc 30 Jan 2006 21:32:09 -0000 1.281
+++ includes/theme.inc 1 Feb 2006 22:41:33 -0000
@@ -280,7 +280,7 @@ function theme_get_settings($key = NULL)
* The value of the requested setting, NULL if the setting does not exist.
*/
function theme_get_setting($setting_name, $refresh = FALSE) {
- global $theme_key, $base_path;
+ global $theme_key;
static $settings;
if (empty($settings) || $refresh) {
@@ -298,7 +298,7 @@ function theme_get_setting($setting_name
}
if ($settings['toggle_logo']) {
- $settings['logo'] = $base_path;
+ $settings['logo'] = base_path();
if ($settings['default_logo']) {
$settings['logo'] .= dirname($theme_object->filename) .'/logo.png';
}
@@ -308,7 +308,7 @@ function theme_get_setting($setting_name
}
if ($settings['toggle_favicon']) {
- $settings['favicon'] = $base_path;
+ $settings['favicon'] = base_path();
if ($settings['default_favicon']) {
if (file_exists($favicon = dirname($theme_object->filename) .'/favicon.ico')) {
$settings['favicon'] .= $favicon;
@@ -331,12 +331,11 @@ function theme_get_setting($setting_name
* drupal_set_html_head() to enforce the correct CSS cascading order.
*/
function theme_add_style($path = '', $media = 'all') {
- global $base_path;
static $styles = array();
if ($path && !isset($styles["$media:$path"])) {
$style = new stdClass();
- $style->path = $base_path. $path;
+ $style->path = base_path() . $path;
$style->media = $media;
$styles["$media:$path"] = $style;
}
@@ -427,10 +426,9 @@ function theme_page($content) {
}
function theme_maintenance_page($content) {
- global $base_path;
drupal_set_header('Content-Type: text/html; charset=utf-8');
theme('add_style', 'misc/maintenance.css');
- drupal_set_html_head('');
+ drupal_set_html_head('');
$output = "\n";
$output .= '';
$output .= '';
@@ -515,10 +513,9 @@ function theme_links($links, $delimiter
* A string containing the image tag.
*/
function theme_image($path, $alt = '', $title = '', $attributes = NULL, $getsize = TRUE) {
- global $base_path;
if (!$getsize || (is_file($path) && (list($width, $height, $type, $image_attributes) = @getimagesize($path)))) {
$attributes = drupal_attributes($attributes);
- return '';
+ return '';
}
}
Index: themes/chameleon/chameleon.theme
===================================================================
RCS file: /cvs/drupal/drupal/themes/chameleon/chameleon.theme,v
retrieving revision 1.40
diff -u -p -r1.40 chameleon.theme
--- themes/chameleon/chameleon.theme 1 Feb 2006 16:04:03 -0000 1.40
+++ themes/chameleon/chameleon.theme 1 Feb 2006 22:41:33 -0000
@@ -22,7 +22,6 @@ function chameleon_regions() {
}
function chameleon_page($content) {
- global $base_path;
$language = $GLOBALS['locale'];
if (theme_get_setting('toggle_favicon')) {
@@ -43,7 +42,7 @@ function chameleon_page($content) {
$output .= "