? .DS_Store
? files
? taxonomy_node_type_required.patch
? update_clean_urls.patch
? sites/default/settings.php
Index: update.php
===================================================================
RCS file: /cvs/drupal/drupal/update.php,v
retrieving revision 1.227
diff -u -p -r1.227 update.php
--- update.php	2 Jul 2007 14:41:34 -0000	1.227
+++ update.php	12 Jul 2007 19:37:59 -0000
@@ -408,19 +408,25 @@ function update_finished($success, $resu
 }
 
 function update_results_page() {
+  $clean_urls = variable_get('clean_url', 0);
   drupal_set_title('Drupal database update');
   // NOTE: we can't use l() here because the URL would point to 'update.php?q=admin'.
   $links[] = '<a href="'. base_path() .'">Main page</a>';
-  $links[] = '<a href="'. base_path() .'?q=admin">Administration pages</a>';
+  if($clean_urls) {
+    $links[] = '<a href="'. base_path() .'admin">Administration pages</a>';
+  }
+  else {
+    $links[] = '<a href="'. base_path() .'admin">Administration pages</a>';
+  }
 
   update_task_list();
   // Report end result
   if ($_SESSION['update_success']) {
-    $output = '<p>Updates were attempted. If you see no failures below, you may proceed happily to the <a href="index.php?q=admin">administration pages</a>. Otherwise, you may need to update your database manually. All errors have been <a href="index.php?q=admin/logs/watchdog">logged</a>.</p>';
+    $output = '<p>Updates were attempted. If you see no failures below, you may proceed happily to the <a href="'. base_path() . ($clean_urls? "admin" : "?q=admin") .'">administration pages</a>. Otherwise, you may need to update your database manually. All errors have been <a href="'. base_path() . ($clean_urls? "admin/logs/watchdog" : "?q=admin/logs/watchdog") .'">logged</a>.</p>';
   }
   else {
     list($module, $version) = array_pop(reset($_SESSION['updates_remaining']));
-    $output = '<p class="error">The update process was aborted prematurely while running <strong>update #'. $version .' in '. $module .'.module</strong>. All other errors have been <a href="index.php?q=admin/logs/watchdog">logged</a>. You may need to check the <code>watchdog</code> database table manually.</p>';
+    $output = '<p class="error">The update process was aborted prematurely while running <strong>update #'. $version .' in '. $module .'.module</strong>. All other errors have been <a href="'. base_path() . ($clean_urls? "admin/logs/watchdog" : "?q=admin/logs/watchdog") .'">logged</a>. You may need to check the <code>watchdog</code> database table manually.</p>';
   }
 
   if ($GLOBALS['access_check'] == FALSE) {