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

3 files changed, 6 insertions, 11 deletions

diff --git a/themes/bluemarine/page.tpl.php b/themes/bluemarine/page.tpl.php
index f75ea826a..76e01fbcd 100644
--- a/themes/bluemarine/page.tpl.php
+++ b/themes/bluemarine/page.tpl.php
@@ -13,8 +13,8 @@
 <table border="0" cellpadding="0" cellspacing="0" id="header">
   <tr>
     <td id="logo">
-      <?php if ($logo) { ?><a href="./" title="Home"><img src="<?php print $logo ?>" alt="Home" /></a><?php } ?>
-      <?php if ($site_name) { ?><h1 class='site-name'><a href="./" title="Home"><?php print $site_name ?></a></h1><?php } ?>
+      <?php if ($logo) { ?><a href="<?php print $base_path ?>" title="Home"><img src="<?php print $logo ?>" alt="Home" /></a><?php } ?>
+      <?php if ($site_name) { ?><h1 class='site-name'><a href="<?php print $base_path ?>" title="Home"><?php print $site_name ?></a></h1><?php } ?>
       <?php if ($site_slogan) { ?><div class='site-slogan'><?php print $site_slogan ?></div><?php } ?>
     </td>
     <td id="menu">
@@ -41,7 +41,6 @@
         <div class="tabs"><?php print $tabs ?></div>
         <?php print $help ?>
         <?php print $messages ?>
-
         <?php print $content; ?>
       </div>
     </td>
diff --git a/themes/engines/phptemplate/phptemplate.engine b/themes/engines/phptemplate/phptemplate.engine
index e7ddc86a2..6aa99f7f2 100644
--- a/themes/engines/phptemplate/phptemplate.engine
+++ b/themes/engines/phptemplate/phptemplate.engine
@@ -140,6 +140,7 @@ function phptemplate_features() {
  * into a pluggable template engine.
  */
 function phptemplate_page($content) {
+  global $base_path;
   /* Set title and breadcrumb to declared values */
 
   if ($_GET['q'] == variable_get('site_frontpage', 'node')) {
@@ -185,6 +186,7 @@ function phptemplate_page($content) {
   }
 
   $variables = array(
+    'base_path'           => $base_path,
     'breadcrumb'          => theme('breadcrumb', drupal_get_breadcrumb()),
     'closure'             => theme('closure'),
     'content'             => '<!-- begin content -->' . $content . '<!-- end content -->',
diff --git a/themes/pushbutton/page.tpl.php b/themes/pushbutton/page.tpl.php
index 56faa28b4..0071c2dbb 100644
--- a/themes/pushbutton/page.tpl.php
+++ b/themes/pushbutton/page.tpl.php
@@ -14,25 +14,19 @@
 <table id="primary-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%">
   <tr>
     <td id="home" width="10%">
-
       <?php if ($logo) : ?>
-        <a href="<?php print url() ?>" title="Home"><img src="<?php print($logo) ?>" alt="Home" width="144" height="63" border="0" /></a>
+        <a href="<?php print $base_path ?>" title="Home"><img src="<?php print($logo) ?>" alt="Home" width="144" height="63" border="0" /></a>
       <?php endif; ?>
-
     </td>
 
     <td id="site-info" width="20%">
-
       <?php if ($site_name) : ?>
-        <div class='site-name'><a href="<?php print url() ?>" title="Home"><?php print($site_name) ?></a></div>
+        <div class='site-name'><a href="<?php print $base_path ?>" title="Home"><?php print($site_name) ?></a></div>
       <?php endif;?>
-
       <?php if ($site_slogan) : ?>
         <div class='site-slogan'><?php print($site_slogan) ?></div>
       <?php endif;?>
-
     </td>
-
     <td class="primary-links" width="70%" align="center" valign="middle">
       <?php print theme('links', $primary_links) ?>
     </td>