diff options
| author | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-02 20:59:56 +0000 |
|---|---|---|
| committer | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-02 20:59:56 +0000 |
| commit | 2820a231076cc640d2de867faeba2e1a3d45a402 (patch) | |
| tree | 1fd80c05de913fb0c53f38ada6caef36e310d545 /engine/lib/elgglib.php | |
| parent | b314a9a072d301e2e89c4873d76429ba46e9c94a (diff) | |
| download | elgg-2820a231076cc640d2de867faeba2e1a3d45a402.tar.gz elgg-2820a231076cc640d2de867faeba2e1a3d45a402.tar.bz2 | |
Refs #2463: Removed some more instances of $CONFIG->url. Added support for elgg_normalize_url to elgg_add_action_tokens_to_url
git-svn-id: http://code.elgg.org/elgg/trunk@7200 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/elgglib.php')
| -rw-r--r-- | engine/lib/elgglib.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 282b69fce..e45b231d4 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -1565,7 +1565,7 @@ function elgg_http_build_url(array $parts, $html_encode = TRUE) { * @link http://docs.elgg.org/Tutorials/Actions */ function elgg_add_action_tokens_to_url($url, $html_encode = TRUE) { - $components = parse_url($url); + $components = parse_url(elgg_normalize_url($url)); if (isset($components['query'])) { $query = elgg_parse_str($components['query']); @@ -1680,11 +1680,11 @@ function elgg_http_url_is_identical($url1, $url2, $ignore_params = array('offset // if the server portion is missing but it starts with / then add the url in. if (elgg_substr($url1, 0, 1) == '/') { - $url1 = $CONFIG->url . ltrim($url1, '/'); + $url1 = elgg_get_site_url() . ltrim($url1, '/'); } if (elgg_substr($url1, 0, 1) == '/') { - $url2 = $CONFIG->url . ltrim($url2, '/'); + $url2 = elgg_get_site_url() . ltrim($url2, '/'); } // @todo - should probably do something with relative URLs |