Index: update.php
===================================================================
RCS file: /cvs/drupal/drupal/update.php,v
retrieving revision 1.237
diff -u -r1.237 update.php
--- update.php	16 Nov 2007 15:35:24 -0000	1.237
+++ update.php	19 Nov 2007 00:39:33 -0000
@@ -408,11 +408,20 @@
 }
 
 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 are enabled then link to 'admin', if not then link to '?q=admin'.
+  if($clean_urls) {
+    $links[] = '<a href="'. base_path() .'admin">Administration pages</a>';
+  }
+  else {
+    $links[] = '<a href="'. base_path() .'?q=admin">Administration pages</a>';
+  }
+ 
   update_task_list();
   // Report end result
   if (module_exists('dblog')) {
@@ -423,11 +432,11 @@
   }
 
   if ($_SESSION['update_success']) {
-    $output = '<p>Updates were attempted. If you see no failures below, you may proceed happily to the <a href="'. base_path() .'?q=admin">administration pages</a>. Otherwise, you may need to update your database manually.'. $log_message .'</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>.'. $log_message;
+    $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 (module_exists('dblog')) {
       $output .= ' You may need to check the <code>watchdog</code> database table manually.';
     }