/sites/all/themes/acquia_marina/template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/acquia_marina/template.php,v
retrieving revision 1.1.2.10
diff -u -p -r1.1.2.10 template.php
--- template.php	13 Feb 2009 08:22:38 -0000	1.1.2.10
+++ template.php	23 Mar 2009 19:08:46 -0000
@@ -230,53 +230,56 @@ function phptemplate_preprocess_page(&$v
     $vars['breadcrumb'] = '';  
   }
   
-  // Set site title, slogan, mission, page title & separator
-  $title = t(variable_get('site_name', ''));
-  $slogan = t(variable_get('site_slogan', ''));
-  $mission = t(variable_get('site_mission', ''));
-  $page_title = t(drupal_get_title());
-  $title_separator = theme_get_setting('configurable_separator');
-  if (drupal_is_front_page()) {                                                // Front page title settings
-    switch (theme_get_setting('front_page_title_display')) {
-      case 'title_slogan':
-        $vars['head_title'] = drupal_set_title($title . $title_separator . $slogan);
-        break;
-      case 'slogan_title':
-        $vars['head_title'] = drupal_set_title($slogan . $title_separator . $title);
-        break;
-      case 'title_mission':
-        $vars['head_title'] = drupal_set_title($title . $title_separator . $mission);
-        break;
-      case 'custom':
-        if (theme_get_setting('page_title_display_custom') !== '') {
-          $vars['head_title'] = drupal_set_title(t(theme_get_setting('page_title_display_custom')));
-        }
+  // Set site title, slogan, mission, page title & separator (unless using Page Title module)
+  if (!module_exists('page_title')) {
+    $title = t(variable_get('site_name', ''));
+    $slogan = t(variable_get('site_slogan', ''));
+    $mission = t(variable_get('site_mission', ''));
+    $page_title = t(drupal_get_title());
+    $title_separator = theme_get_setting('configurable_separator');
+    if (drupal_is_front_page()) {                                                // Front page title settings
+      switch (theme_get_setting('front_page_title_display')) {
+        case 'title_slogan':
+          $vars['head_title'] = drupal_set_title($title . $title_separator . $slogan);
+          break;
+        case 'slogan_title':
+          $vars['head_title'] = drupal_set_title($slogan . $title_separator . $title);
+          break;
+        case 'title_mission':
+          $vars['head_title'] = drupal_set_title($title . $title_separator . $mission);
+          break;
+        case 'custom':
+          if (theme_get_setting('page_title_display_custom') !== '') {
+            $vars['head_title'] = drupal_set_title(t(theme_get_setting('page_title_display_custom')));
+          }
+      }
     }
-  }
-  else {                                                                       // Non-front page title settings
-    switch (theme_get_setting('other_page_title_display')) {
-      case 'ptitle_slogan':
-        $vars['head_title'] = drupal_set_title($page_title . $title_separator . $slogan);
-        break;
-      case 'ptitle_stitle':
-        $vars['head_title'] = drupal_set_title($page_title . $title_separator . $title);
-        break;
-      case 'ptitle_smission':
-        $vars['head_title'] = drupal_set_title($page_title . $title_separator . $mission);
-        break;
-      case 'ptitle_custom':
-        if (theme_get_setting('other_page_title_display_custom') !== '') {
-          $vars['head_title'] = drupal_set_title($page_title . $title_separator . t(theme_get_setting('other_page_title_display_custom')));
-        }
-        break;
-      case 'custom':
-        if (theme_get_setting('other_page_title_display_custom') !== '') {
-          $vars['head_title'] = drupal_set_title(t(theme_get_setting('other_page_title_display_custom')));
-        }
+    else {                                                                       // Non-front page title settings
+      switch (theme_get_setting('other_page_title_display')) {
+        case 'ptitle_slogan':
+          $vars['head_title'] = drupal_set_title($page_title . $title_separator . $slogan);
+          break;
+        case 'ptitle_stitle':
+          $vars['head_title'] = drupal_set_title($page_title . $title_separator . $title);
+          break;
+        case 'ptitle_smission':
+          $vars['head_title'] = drupal_set_title($page_title . $title_separator . $mission);
+          break;
+        case 'ptitle_custom':
+          if (theme_get_setting('other_page_title_display_custom') !== '') {
+            $vars['head_title'] = drupal_set_title($page_title . $title_separator . t(theme_get_setting('other_page_title_display_custom')));
+          }
+          break;
+        case 'custom':
+          if (theme_get_setting('other_page_title_display_custom') !== '') {
+            $vars['head_title'] = drupal_set_title(t(theme_get_setting('other_page_title_display_custom')));
+          }
+      }
     }
+    $vars['head_title'] = strip_tags($vars['head_title']);                       // Remove any potential html tags
   }
-  $vars['head_title'] = strip_tags($vars['head_title']);                       // Remove any potential html tags
   
+  // Set meta keywords and description (unless using Meta tags module)
   if (!module_exists('nodewords')) {
     if (theme_get_setting('meta_keywords') !== '') {
       $keywords = '<meta name="keywords" content="'. theme_get_setting('meta_keywords') .'" />';
@@ -287,7 +290,10 @@ function phptemplate_preprocess_page(&$v
       $vars['head'] .= $keywords ."\n";
     } 
   }
-  $vars['closure'] .= '<div id="legal-notice">Theme provided by <a href="http://www.acquia.com">Acquia, Inc.</a> under GPL license from TopNotchThemes <a href="http://www.topnotchthemes.com">Drupal themes</a></div>';
+
+  if (drupal_is_front_page()) {
+    $vars['closure'] .= '<div id="legal-notice">Theme provided by <a href="http://www.acquia.com">Acquia, Inc.</a> under GPL license from TopNotchThemes <a href="http://www.topnotchthemes.com">Drupal themes</a></div>';
+  }
 }