summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-03-07 07:33:17 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-03-07 07:33:17 +0000
commit05357ce6f73ba73941e060d6e8e801d011e89698 (patch)
treeced90b23f9558559f80b551ad5a776dfe8509f21
parenta1828b232e59b078f19b8f4951a4aa6d3029f392 (diff)
downloadbrdo-05357ce6f73ba73941e060d6e8e801d011e89698.tar.gz
brdo-05357ce6f73ba73941e060d6e8e801d011e89698.tar.bz2
#587706 by dalin: Fixed language_initialize() needs to clean up ['q'] just like drupal_path_initialize() does.
-rw-r--r--includes/language.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/language.inc b/includes/language.inc
index d31928269..52b5bd6ce 100644
--- a/includes/language.inc
+++ b/includes/language.inc
@@ -342,7 +342,7 @@ function language_from_default() {
* - The path without the prefix on success, the given path otherwise.
*/
function language_url_split_prefix($path, $languages) {
- $args = empty($path) ? array() : explode('/', $path);
+ $args = empty($path) ? array() : explode('/', trim($path, '/'));
$prefix = array_shift($args);
// Search prefix within enabled languages.