--- page_title.module	2006-09-28 02:23:38.000000000 -0700
+++ ../../../../trunk/public_html/modules/page_title/page_title.module	2006-12-04 12:34:35.000000000 -0700
@@ -67,6 +67,7 @@ function page_title_form_alter($form_id,
       '#size' => 60,
       '#maxlength' => 127,
       '#weight' => -4,
+      '#description' => t('Optionally specify a different title to appear in the &lt;title&gt; tag of the page. (Available placeholders: <code>%page_title</code>, <code>%site_name</code>, <code>%site_slogan</code>.)<br /> The default is: <code>'.variable_get('page_title_individual', '%page_title | %site_name').'</code>')
     );
   }
 }
@@ -136,14 +137,14 @@ function page_title_page_get_title() {
   // this is the normal title. For node pages it is $node->title
   $drupal_title = strip_tags(drupal_get_title());
 
-  // this is the custom page title. For node pages it is $node->page_title.
-  $page_title = (page_title_set_title()) ? strip_tags(page_title_set_title()) : $drupal_title;
-
   $site_name = variable_get('site_name', 'drupal');
   $site_slogan = variable_get('site_slogan', '');
 
-  if ($drupal_title) {
-    $title = t($page_title_individual, array('%page_title' => $page_title, '%site_name' => $site_name, '%site_slogan' => $site_slogan));
+  if (page_title_set_title()) {
+    // this is the custom page title. For node pages it is $node->page_title.
+    $title = t(strip_tags(page_title_set_title()), array('%page_title' => $drupal_title, '%site_name' => $site_name, '%site_slogan' => $site_slogan));
+  } elseif ($drupal_title) {
+    $title = t($page_title_individual, array('%page_title' => $drupal_title, '%site_name' => $site_name, '%site_slogan' => $site_slogan));
   }
   else {
     $title = t($page_title_front, array('%site_name' => $site_name, '%site_slogan' => $site_slogan));