diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/locale.inc | 4 | ||||
| -rw-r--r-- | includes/path.inc | 2 |
2 files changed, 4 insertions, 2 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 |