aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/elgglib.php
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-02-12 14:56:20 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-02-12 14:56:20 +0000
commita2c37d05458bc25168bbfc892604208ffc17384b (patch)
treee8b2360af1be307cc9259a733700e4c4e4fcf5dc /engine/lib/elgglib.php
parentc8c1ed7b095be798f459cd75a18d0dc249068ca6 (diff)
downloadelgg-a2c37d05458bc25168bbfc892604208ffc17384b.tar.gz
elgg-a2c37d05458bc25168bbfc892604208ffc17384b.tar.bz2
Fixes #1512: Using a helper function for mb_parse_str() instead of wrapping it exactly.
git-svn-id: http://code.elgg.org/elgg/trunk@3934 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/elgglib.php')
-rw-r--r--engine/lib/elgglib.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 52b4ecf32..91334821d 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -943,11 +943,11 @@ function get_submenu() {
$item_params = array();
if (isset($uri_info['query'])) {
$uri_info['query'] = html_entity_decode($uri_info['query']);
- elgg_parse_str($uri_info['query'], $uri_params);
+ $uri_params = elgg_parse_str($uri_info['query']);
}
if (isset($item_info['query'])) {
$item_info['query'] = html_entity_decode($item_info['query']);
- elgg_parse_str($item_info['query'], $item_params);
+ $item_params = elgg_parse_str($item_info['query']);
}
$uri_info['path'] = trim($uri_info['path'], '/');
@@ -2521,7 +2521,7 @@ function elgg_validate_action_url($link) {
$url = parse_url($link);
if (isset($url['query'])) {
- elgg_parse_str($url['query'], $query);
+ $query = elgg_parse_str($url['query']);
} else {
$query = array();
}
@@ -2550,7 +2550,7 @@ function elgg_http_remove_url_query_element($url, $element) {
$url_array = parse_url($url);
if (isset($url_array['query'])) {
- elgg_parse_str($url_array['query'], $query);
+ $query = elgg_parse_str($url_array['query']);
} else {
// nothing to remove. Return original URL.
return $url;
@@ -2577,7 +2577,7 @@ function elgg_http_add_url_query_elements($url, array $elements) {
$url_array = parse_url($url);
if (isset($url_array['query'])) {
- elgg_parse_str($url_array['query'], $query);
+ $query = elgg_parse_str($url_array['query']);
} else {
$query = array();
}