Commit afacb522 authored by Dries's avatar Dries
Browse files

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

parent a0840582
...@@ -977,13 +977,12 @@ function locale_url_outbound_alter(&$path, &$options, $original_path) { ...@@ -977,13 +977,12 @@ function locale_url_outbound_alter(&$path, &$options, $original_path) {
$negotiation = variable_get("language_negotiation_$type", array()); $negotiation = variable_get("language_negotiation_$type", array());
foreach ($negotiation as $id => $provider) { 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'])) { 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;
} }
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment