Index: includes/locale.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/locale.inc,v
retrieving revision 1.236
diff -u -p -r1.236 locale.inc
--- includes/locale.inc	2 Dec 2009 14:56:32 -0000	1.236
+++ includes/locale.inc	6 Dec 2009 07:21:39 -0000
@@ -242,6 +242,7 @@ function locale_languages_edit_form($for
   }
   else {
     drupal_not_found();
+    drupal_exit();
   }
 }
 
@@ -444,6 +445,7 @@ function locale_languages_delete_form($f
 
   if (!isset($languages[$langcode])) {
     drupal_not_found();
+    drupal_exit();
   }
   else {
     $form['langcode'] = array('#type' => 'value', '#value' => $langcode);
@@ -1693,7 +1695,7 @@ function _locale_import_po($file, $langc
   drupal_set_message(t('The translation was successfully imported. There are %number newly created translated strings, %update strings were updated and %delete strings were removed.', array('%number' => $additions, '%update' => $updates, '%delete' => $deletes)));
   watchdog('locale', 'Imported %file into %locale: %number new strings added, %update updated and %delete removed.', array('%file' => $file->filename, '%locale' => $langcode, '%number' => $additions, '%update' => $updates, '%delete' => $deletes));
   if ($skips) {
-    $skip_message = format_plural($skips, 'One translation string was skipped because it contains disallowed HTML.', '@count translation strings were skipped because they contain disallowed HTML.');
+    $skip_message = format_plural($skips, 'One translation string in %file was skipped because it contains disallowed HTML.', '@count translation strings in %file were skipped because they contain disallowed HTML.', array('%file' => $file->filename));
     drupal_set_message($skip_message);
     watchdog('locale', $skip_message, NULL, WATCHDOG_WARNING);
   }
Index: includes/path.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/path.inc,v
retrieving revision 1.51
diff -u -p -r1.51 path.inc
--- includes/path.inc	2 Dec 2009 19:26:21 -0000	1.51
+++ includes/path.inc	6 Dec 2009 06:41:00 -0000
@@ -161,7 +161,7 @@ function drupal_cache_system_paths() {
   // Check if the system paths for this page were loaded from cache in this
   // request to avoid writing to cache on every request.
   $cache = &drupal_static('drupal_lookup_path', array());
-  if (!$cache['system_paths']) {
+  if (empty($cache['system_paths'])) {
     // Generate a cache ID (cid) specifically for this page.
     $cid = current_path();
     // The static $map array used by drupal_lookup_path() includes all
Index: modules/contact/contact.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.pages.inc,v
retrieving revision 1.36
diff -u -p -r1.36 contact.pages.inc
--- modules/contact/contact.pages.inc	1 Nov 2009 21:26:44 -0000	1.36
+++ modules/contact/contact.pages.inc	6 Dec 2009 07:07:35 -0000
@@ -20,7 +20,8 @@ function contact_site_form($form, &$form
   $window = variable_get('contact_threshold_window', 3600);
   if (!flood_is_allowed('contact', $limit, $window) && !user_access('administer contact forms')) {
     drupal_set_message(t("You cannot send more than %limit messages in @interval. Please try again later.", array('%limit' => $limit, '@interval' => format_interval($window))), 'error');
-    return drupal_access_denied();
+    drupal_access_denied();
+    drupal_exit();
   }
 
   // Get an array of the categories and the current default category.
@@ -39,7 +40,8 @@ function contact_site_form($form, &$form
       drupal_set_message(t('The contact form has not been configured. <a href="@add">Add one or more categories</a> to the form.', array('@add' => url('admin/structure/contact/add'))), 'error');
     }
     else {
-      return drupal_not_found();
+      drupal_not_found();
+      drupal_exit();
     }
   }
 
@@ -177,7 +179,8 @@ function contact_personal_form($form, &$
   $window = variable_get('contact_threshold_window', 3600);
   if (!flood_is_allowed('contact', $limit, $window) && !user_access('administer contact forms') && !user_access('administer users')) {
     drupal_set_message(t("You cannot send more than %limit messages in @interval. Please try again later.", array('%limit' => $limit, '@interval' => format_interval($window))), 'error');
-    return drupal_access_denied();
+    drupal_access_denied();
+    drupal_exit();
   }
 
   drupal_set_title(t('Contact @username', array('@username' => format_username($recipient))), PASS_THROUGH);
Index: modules/system/system.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.test,v
retrieving revision 1.93
diff -u -p -r1.93 system.test
--- modules/system/system.test	2 Dec 2009 19:26:22 -0000	1.93
+++ modules/system/system.test	6 Dec 2009 07:09:35 -0000
@@ -528,6 +528,7 @@ class AccessDeniedTestCase extends Drupa
   function testAccessDenied() {
     $this->drupalGet('admin');
     $this->assertText(t('Access denied'), t('Found the default 403 page'));
+    $this->assertReponse(403);
 
     $edit = array(
       'title' => array(LANGUAGE_NONE => array(array('value' => $this->randomName(10)))),
@@ -557,6 +558,7 @@ class AccessDeniedTestCase extends Drupa
 
     $this->drupalGet('admin');
     $this->assertText(t('Access denied'), t('Found the default 403 page'));
+    $this->assertReponse(403);
     $this->assertText(t('User login'), t('Blocks are shown on the default 403 page'));
 
     // Log back in, set the custom 403 page to /user and remove the block