? 365992-pathauto-path-redirect-integration-D6.patch
? pathauto-fix-checkbox.patch
Index: pathauto.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.inc,v
retrieving revision 1.45
diff -u -p -r1.45 pathauto.inc
--- pathauto.inc	18 Jun 2008 20:02:40 -0000	1.45
+++ pathauto.inc	4 Feb 2009 15:03:06 -0000
@@ -317,6 +317,10 @@ function pathauto_create_alias($module, 
     }
   }
 
+  if ($op == 'return') {
+    return $alias;
+  }
+
   // If $pid is NULL, a new alias is created - otherwise, the existing
   // alias for the designated src is replaced
   _pathauto_set_alias($src, $alias, $module, $entity_id, $pid, $verbose, $old_alias, $language);
Index: pathauto.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.module,v
retrieving revision 1.118
diff -u -p -r1.118 pathauto.module
--- pathauto.module	20 Jun 2008 20:01:01 -0000	1.118
+++ pathauto.module	4 Feb 2009 15:03:07 -0000
@@ -289,10 +289,13 @@ function pathauto_form_alter(&$form, $fo
       drupal_add_js(drupal_get_path('module', 'pathauto') .'/pathauto.js');
       $form['path']['#collapsed'] = FALSE;
 
+      $placeholders = pathauto_get_placeholders('node', $node);
+      $alias = pathauto_create_alias('node', 'return', $placeholders, "node/{$node->nid}", $node->nid, $node->type, $node->language);
+
       $form['path']['pathauto_perform_alias'] = array(
         '#type' => 'checkbox',
         '#title' => t('Automatic alias'),
-        '#default_value' => isset($node->pathauto_perform_alias) ? $node->pathauto_perform_alias : TRUE,
+        '#default_value' => !empty($node->pathauto_perform_alias) && (!isset($node->path) || ($alias == $node->path)),
         '#description' => $output,
         '#weight' => -1,
       );