summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/modules/locale/locale.module11
1 files changed, 5 insertions, 6 deletions
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index 6b18988..01e9d91 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -977,13 +977,12 @@ function locale_url_outbound_alter(&$path, &$options, $original_path) {
$negotiation = variable_get("language_negotiation_$type", array());
foreach ($negotiation as $id => $provider) {
- if (isset($provider['file'])) {
- require_once DRUPAL_ROOT . '/' . $provider['file'];
- }
-
- // Avoid duplicate callback entries.
if (isset($provider['callbacks']['url_rewrite'])) {
- $callbacks[$provider['callbacks']['url_rewrite']] = NULL;
+ if (isset($provider['file'])) {
+ require_once DRUPAL_ROOT . '/' . $provider['file'];
+ }
+ // Avoid duplicate callback entries.
+ $callbacks[$provider['callbacks']['url_rewrite']] = TRUE;
}
}
}