- Patch #13148: fix problems with using relative path names! (Please document this change.)

1 files changed, 8 insertions, 7 deletions

diff --git a/includes/common.inc b/includes/common.inc
index 6c195b8e0..9f82fe440 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -114,11 +114,10 @@ function drupal_set_html_head($data = NULL) {
  * Retrieve output to be displayed in the head tag of the HTML page.
  */
 function drupal_get_html_head() {
-  global $base_url;
+  global $base_path;
 
   $output = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
-  $output .= "<base href=\"$base_url/\" />\n";
-  $output .= theme('stylesheet_import', 'misc/drupal.css');
+  $output .= theme('stylesheet_import', $base_path .'misc/drupal.css');
 
   return $output . drupal_set_html_head();
 }
@@ -919,7 +918,7 @@ function url($path = NULL, $query = NULL, $fragment = NULL, $absolute = FALSE) {
     return $path . $fragment;
   }
 
-  global $base_url;
+  global $base_url, $base_path;
   static $script;
   static $clean_url;
 
@@ -935,7 +934,7 @@ function url($path = NULL, $query = NULL, $fragment = NULL, $absolute = FALSE) {
     $clean_url = (bool)variable_get('clean_url', '0');
   }
 
-  $base = ($absolute ? $base_url .'/' : '');
+  $base = ($absolute ? $base_url . '/' : $base_path);
 
   // The special path '<front>' links to the default front page.
   if (isset($path) && $path != '<front>') {
@@ -1134,13 +1133,15 @@ 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('<script type="text/javascript" src="misc/drupal.js"></script>');
+    drupal_set_html_head('<script type="text/javascript" src="'. $base_path .'misc/drupal.js"></script>');
     $sent['misc/drupal.js'] = true;
   }
   if (!isset($sent[$file])) {
-    drupal_set_html_head('<script type="text/javascript" src="'. check_url($file) .'"></script>');
+    drupal_set_html_head('<script type="text/javascript" src="'. check_url($base_path . $file) .'"></script>');
     $sent[$file] = true;
   }
 }