Index: template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/template.php,v
retrieving revision 1.45.2.9
diff -u -r1.45.2.9 template.php
--- template.php	14 Sep 2010 18:49:56 -0000	1.45.2.9
+++ template.php	30 Sep 2010 10:10:37 -0000
@@ -383,6 +383,34 @@
       $vars['classes_array'][] = 'page-panels';
       break;
   }
+
+  if ($vars['logo']) {
+    // Remove the base path from the logo path, so theme_image() can use it.
+    $logo_path = preg_replace('#^' . preg_quote(base_path()) . '#', '', $vars['logo']);
+    // Construct the logo image.
+    $vars['logo'] = theme('image', $logo_path, t('Home'));
+    // Link it to the to the frontpage when we aren't on the frontpage.
+    if (!$vars['is_front']) {
+      $vars['logo'] = l($vars['logo'], '<front>', array(
+        'html' => TRUE,
+        'attributes' => array(
+          'title' => t('Home'),
+          'rel' => 'home',
+        ),
+      ));
+    }
+  }
+
+  // Link the site name to the frontpage when we aren't on the frontpage.
+  if ($vars['site_name'] && !$vars['is_front']) {
+    $vars['site_name'] = l($vars['site_name'], '<front>', array(
+      'html' => TRUE,
+      'attributes' => array(
+        'title' => t('Home'),
+        'rel' => 'home',
+      ),
+    ));
+  }
 }
 
 /**
Index: templates/page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/templates/page.tpl.php,v
retrieving revision 1.26.2.4
diff -u -r1.26.2.4 page.tpl.php
--- templates/page.tpl.php	14 Sep 2010 18:49:59 -0000	1.26.2.4
+++ templates/page.tpl.php	30 Sep 2010 10:10:37 -0000
@@ -54,9 +54,9 @@
  * Site identity:
  * - $front_page: The URL of the front page. Use this instead of $base_path,
  *   when linking to the front page. This includes the language domain or prefix.
- * - $logo: The path to the logo image, as defined in theme configuration.
- * - $site_name: The name of the site, empty when display has been disabled
- *   in theme settings.
+ * - $logo: The logo image, usually linked to the frontpage.
+ * - $site_name: The name of the site, usually linked to the frontpage. Empty
+ *   when display has been disabled in theme settings.
  * - $site_slogan: The slogan of the site, empty when display has been disabled
  *   in theme settings.
  * - $mission: The text of the site mission, empty when display has been disabled
@@ -127,7 +127,7 @@
     <div id="header"><div class="section clearfix">
 
       <?php if ($logo): ?>
-        <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home" id="logo"><img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" /></a>
+        <div id="logo"><?php print $logo; ?></div>
       <?php endif; ?>
 
       <?php if ($site_name || $site_slogan): ?>
@@ -135,11 +135,11 @@
           <?php if ($site_name): ?>
             <?php if ($title): ?>
               <div id="site-name"><strong>
-                <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
+                <?php print $site_name; ?>
               </strong></div>
             <?php else: /* Use h1 when the content title is empty */ ?>
               <h1 id="site-name">
-                <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
+                <?php print $site_name; ?>
               </h1>
             <?php endif; ?>
           <?php endif; ?>