Index: page_title.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/page_title/page_title.install,v
retrieving revision 1.10
diff -u -r1.10 page_title.install
--- page_title.install	2 May 2008 16:29:11 -0000	1.10
+++ page_title.install	21 May 2008 19:08:58 -0000
@@ -8,7 +8,9 @@
   drupal_install_schema('page_title');
 }
 
-
+/**
+ * Implementation of hook_schema().
+ */
 function page_title_schema() {
   $schema['page_title'] = array(
     'fields' => array(
@@ -21,15 +23,15 @@
   return $schema;
 }
 
-
 /**
  * Implementation of hook_uninstall().
  */
 function page_title_uninstall() {
-  db_query('DROP TABLE {page_title}');
+  drupal_uninstall_schema('page_title');
+  
   variable_del('page_title_individual');
   variable_del('page_title_front');
   foreach (node_get_types('names') AS $type => $name) {
     variable_del("page_title_display_$type");
   }
-}
\ No newline at end of file
+}
Index: template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/page_title/template.php,v
retrieving revision 1.3
diff -u -r1.3 template.php
--- template.php	10 Jul 2007 09:47:05 -0000	1.3
+++ template.php	21 May 2008 19:08:58 -0000
@@ -1,11 +1,12 @@
-<?php
-
-function _phptemplate_variables($hook, $vars) {
-  $vars = array();
-  if ($hook == 'page') {
-    if (module_exists('page_title')) {
-      $vars['head_title'] = page_title_page_get_title();
-    }
-  }
-  return $vars;
-}
+<?php
+// $Id$
+
+function _phptemplate_variables($hook, $vars) {
+  $vars = array();
+  if ($hook == 'page') {
+    if (module_exists('page_title')) {
+      $vars['head_title'] = page_title_page_get_title();
+    }
+  }
+  return $vars;
+}
Index: README.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/page_title/README.txt,v
retrieving revision 1.6
diff -u -r1.6 README.txt
--- README.txt	29 Dec 2007 17:23:49 -0000	1.6
+++ README.txt	21 May 2008 19:08:58 -0000
@@ -1,3 +1,5 @@
+// $Id$
+
 ********************************************************************
                 P A G E    T I T L E    M O D U L E
 ********************************************************************
Index: CHANGELOG.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/page_title/CHANGELOG.txt,v
retrieving revision 1.6
diff -u -r1.6 CHANGELOG.txt
--- CHANGELOG.txt	29 Dec 2007 17:23:49 -0000	1.6
+++ CHANGELOG.txt	21 May 2008 19:08:57 -0000
@@ -1,3 +1,7 @@
+// $Id$
+
+Page Title 6.x-2.0
+
 Page Title 5.x-2.0
   #119016: Added ability to hide the Page title text box based on content type.
   #101310: Integrated Token module
Index: page_title-admin-settings-form.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/page_title/page_title-admin-settings-form.tpl.php,v
retrieving revision 1.1
diff -u -r1.1 page_title-admin-settings-form.tpl.php
--- page_title-admin-settings-form.tpl.php	2 May 2008 16:34:55 -0000	1.1
+++ page_title-admin-settings-form.tpl.php	21 May 2008 19:08:58 -0000
@@ -1,4 +1,6 @@
 <?php
+// $Id$
+
 $rows = array();
 
 foreach (element_children($form['title']) as $key) {
Index: page_title.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/page_title/page_title.module,v
retrieving revision 1.18.2.1
diff -u -r1.18.2.1 page_title.module
--- page_title.module	5 May 2008 18:23:41 -0000	1.18.2.1
+++ page_title.module	21 May 2008 19:08:58 -0000
@@ -11,34 +11,34 @@
  * to the node title.
  */
 
-
 /**
  * Implementation of hook_help().
  */
-function page_title_help($section) {
-  switch ($section) {
+function page_title_help($path, $arg) {
+  $output = '';
+  
+  switch ($path) {
     case 'admin/help#page_title':
-      $output  = t('<p>Provides control over the &lt;title> element on a page using token patterns and an optional textfield to override the node title.</p>');
-      $output .= t('<p>Below are all the tokens you can use with <strong><em>Page Title</em></strong>:</p>');
+      $output  = '<p>'. t('Provides control over the &lt;title> element on a page using token patterns and an optional textfield to override the node title.') .'</p>';
+      $output .= '<p>'. t('Below are all the tokens you can use with <strong><em>Page Title</em></strong>:') .'</p>';
       $output .= theme('token_help');
       break;
     case 'admin/content/page_title':
-      $output = t("<p>Drupal's default page title follows one of two patterns:</p>
-        <ol>
-          <li><strong>Default Page:</strong> <em>page title</em> | <em>site name</em></li>
-          <li><strong>Default Frontpage:</strong> <em>site name</em> | <em>site slogan</em></li>
-        </ol>
-        <p>The <strong>Page Title</strong> module lets you change these defaults in two ways. First, you can adjust the patterns below using the placeholders given. This will change the way the default page titles are created. Second, on every content creation form you can have the option of specifying a title that is different than the title of the node. If a value is provided, this will be used to generate the <code>[page-title]</code> placeholder. If left blank, <code>[page-title]</code> will inherit the node's title.</p>
-        <p><code>[page-title]</code> will default to the value returned from <code>drupal_get_title</code> if there is no overriden page title.</p>");
+      $output = '<p>'. t("Drupal's default page title follows one of two patterns:") .'</p>';
+      $output .= '<ol>';
+      $output .= '<li>'. t('<strong>Default Page:</strong> <em>page title</em> | <em>site name</em>') .'</li>';
+      $output .= '<li>'. t('<strong>Default Frontpage:</strong> <em>site name</em> | <em>site slogan</em>') .'</li>';
+      $output .= '</ol>';
+      $output .= '<p>'. t("The <strong>Page Title</strong> module lets you change these defaults in two ways. First, you can adjust the patterns below using the placeholders given. This will change the way the default page titles are created. Second, on every content creation form you can have the option of specifying a title that is different than the title of the node. If a value is provided, this will be used to generate the <code>[page-title]</code> placeholder. If left blank, <code>[page-title]</code> will inherit the node's title.") .'</p>';
+      $output .= '<p>'. t('<code>[page-title]</code> will default to the value returned from <code>drupal_get_title</code> if there is no overriden page title.') .'</p>';
       break;
     case 'admin/content/page_title/types':
-      $output = t("<p>To display a 'Page Title' field on a node (just below the 'Title' field), you will need to enable it for the appropriate content types below.</p>");
+      $output = '<p>'. t("To display a 'Page Title' field on a node (just below the 'Title' field), you will need to enable it for the appropriate content types below.") .'</p>';
       break;
   }
   return $output;
 }
 
-
 /**
  * Implementation of hook_perm().
  */
@@ -46,7 +46,6 @@
   return array('set page title', 'administer page titles');
 }
 
-
 /**
  * Implementation of hook_menu().
  */
@@ -62,9 +61,6 @@
   );
   $items['admin/content/page_title/settings'] = array(
     'title' => t('Default settings'),
-    'description' => t('Control the page title settings.'),
-    'access callback' => 'user_access',
-    'access arguments' => array('administer page titles'),
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => -10,
   );
@@ -81,9 +77,8 @@
   return $items;
 }
 
-
 /**
- * Implementation of hook_theme
+ * Implementation of hook_theme().
  */
 function page_title_theme() {
   return array(
@@ -91,14 +86,12 @@
       'template' => 'page_title-admin-settings-form',
       'arguments' => array('form' => NULL),
     ),
-
     'page_title_preprocess_page' => array(
       'arguments' => array('vars' => NULL),
     ),
   );
 }
 
-
 /**
  * Displays the form for the standard settings tab.
  *
@@ -117,7 +110,7 @@
   //Definate the patterns per-node-type
   $types = node_get_types();
   foreach ($types as $type) {
-    $key = 'page_title_type_' . $type->type;
+    $key = 'page_title_type_'. $type->type;
     $form['title'][$key]   = array('#type' => 'markup', '#value' => t('Pattern for %type', array('%type' => $type->name)), );
     $form['pattern'][$key] = array('#type' => 'textfield', '#default_value' => variable_get($key, ''), '#maxlength' => 128, '#description' => t('If left blank, will inherit from default settings.'));
   }
@@ -130,7 +123,6 @@
   return $form;
 }
 
-
 /**
  * Displays the form for the "Content creation types" tab.
  *
@@ -154,7 +146,6 @@
   return system_settings_form($form);
 }
 
-
 /**
  * Implementation of hook_node_type().
  *
@@ -181,25 +172,26 @@
     variable_set('page_title_display', $display);
     
     //Get the old pattern, if set
-    $old_pattern = variable_get('page_title_type_' . $info->old_type, '');
+    $old_pattern = variable_get('page_title_type_'. $info->old_type, '');
     
     //If it was set then set the new one to whatever the old pattern was
     if (!empty($old_pattern)) {
-      variable_set('page_title_type_' . $info->type, $old_pattern);
+      variable_set('page_title_type_'. $info->type, $old_pattern);
     }
     
     //Delete the old pattern
-    variable_del('page_title_type_' . $info->old_type);
+    variable_del('page_title_type_'. $info->old_type);
   }
 }
 
-
 /**
  * Implementation of hook_form_alter().
  */
 function page_title_form_alter(&$form, $form_state, $form_id) {
   //If we dont have permission to set the title then we need to abort this alter now!
-  if (!user_access('set page title')) return;
+  if (!user_access('set page title')) {
+    return;
+  }
   
   $display = variable_get('page_title_display', array());
   
@@ -217,7 +209,6 @@
   }
 }
 
-
 /**
  * Implementation of hook_nodeapi().
  */
@@ -241,25 +232,21 @@
   }
 }
 
-
 /**
  * Simple wrapper function to get the currently set title for a page
  *
  * @return unknown
  */
 function page_title_get_title() {
-  $display_options = variable_get('page_title_display', array());
-  $node = ((arg(0) == 'node') && (is_numeric(arg(1)))) ? node_load(arg(1)) : NULL;
-  
-  if ($display_options[$node->type] && !empty($node->page_title)) {
-    return check_plain(strip_tags($node->page_title));
-  }
-  else {
-    return strip_tags(drupal_get_title());
+  if ($node = menu_get_object()) {
+    $display_options = variable_get('page_title_display', array());
+    if ($display_options[$node->type] && !empty($node->page_title)) {
+      return check_plain(strip_tags($node->page_title));
+    }
   }
+  return strip_tags(drupal_get_title());
 }
 
-
 // Public API (every module's gotta have one =)
 
 /**
@@ -274,7 +261,6 @@
   return db_result(db_query('SELECT page_title FROM {page_title} WHERE nid = %d', $nid));
 }
 
-
 /**
  * Determines what title should be sent to the page template.
  *
@@ -296,10 +282,10 @@
     //Otherwise this is a non-frontpage page title.
     else {
       //Get the node for this page
-      $node = ((arg(0) == 'node') && (is_numeric(arg(1)))) ? node_load(arg(1)) : NULL;
+      $node = menu_get_object();
 
       //Get the pattern for the node type. If no node type available, assume blank
-      $page_title_pattern = variable_get('page_title_type_' . (isset($node->type) ? $node->type : ''), '');
+      $page_title_pattern = variable_get('page_title_type_'. (isset($node->type) ? $node->type : ''), '');
       
       //If pattern is emtpy (either if the type is not overridable or simply not set) fallback to the default pattern
       if (empty($page_title_pattern)) {
@@ -319,9 +305,8 @@
   return $title;
 }
 
-
 /**
- * Implementation of hook_token_values
+ * Implementation of hook_token_values().
  *
  * @param
  *   string The type of token being generated
@@ -339,9 +324,8 @@
   return $values;
 }
 
-
 /**
- * Implementation of hook_token_list
+ * Implementation of hook_token_list().
  *
  * @param
  *   string Which type of token list are we generating?
@@ -359,9 +343,8 @@
   return $tokens;
 }
 
-
 /**
- *  Implementation of hook_preprocess_page
+ *  Implementation of hook_preprocess_page().
  */
 function page_title_preprocess_page(&$vars) {
   $vars['head_title'] = page_title_page_get_title();
