diff options
| -rw-r--r-- | includes/locale.inc | 4 | ||||
| -rw-r--r-- | includes/path.inc | 2 | ||||
| -rw-r--r-- | modules/contact/contact.pages.inc | 9 | ||||
| -rw-r--r-- | modules/system/system.test | 2 |
4 files changed, 12 insertions, 5 deletions
diff --git a/includes/locale.inc b/includes/locale.inc index fe01cbd3d..beb154ca7 100644 --- a/includes/locale.inc +++ b/includes/locale.inc @@ -242,6 +242,7 @@ function locale_languages_edit_form($form, &$form_state, $langcode) { } else { drupal_not_found(); + drupal_exit(); } } @@ -444,6 +445,7 @@ function locale_languages_delete_form($form, &$form_state, $langcode) { if (!isset($languages[$langcode])) { drupal_not_found(); + drupal_exit(); } else { $form['langcode'] = array('#type' => 'value', '#value' => $langcode); @@ -1695,7 +1697,7 @@ function _locale_import_po($file, $langcode, $mode, $group = NULL) { 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.'); drupal_set_message($skip_message); - watchdog('locale', $skip_message, NULL, WATCHDOG_WARNING); + watchdog('locale', '@count disallowed HTML string(s) in %file', array('@count' => $skips, '%file' => $file->uri), WATCHDOG_WARNING); } return TRUE; } diff --git a/includes/path.inc b/includes/path.inc index 00c907204..cbbaff691 100644 --- a/includes/path.inc +++ b/includes/path.inc @@ -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 diff --git a/modules/contact/contact.pages.inc b/modules/contact/contact.pages.inc index f3827083d..fcf3d6e2e 100644 --- a/modules/contact/contact.pages.inc +++ b/modules/contact/contact.pages.inc @@ -20,7 +20,8 @@ function contact_site_form($form, &$form_state) { $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_state) { 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, &$form_state, stdClass $recipient) { $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); diff --git a/modules/system/system.test b/modules/system/system.test index 9ecebd9ec..522f96b0a 100644 --- a/modules/system/system.test +++ b/modules/system/system.test @@ -528,6 +528,7 @@ class AccessDeniedTestCase extends DrupalWebTestCase { 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 DrupalWebTestCase { $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 |