- Patch #852524 by plach, oriol_e9g: include language provider files only when they are needed.

1 files changed, 5 insertions, 6 deletions

diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index 0138f3964..caa01f2f3 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -1007,13 +1007,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;
           }
         }
       }