elgg_http_build_query() now supports ports.

Checking for __elgg_ts also in elgg_validate_action_url().
Fixed a spelling mistake ;)

git-svn-id: http://code.elgg.org/elgg/trunk@3820 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 314c8753040ab1eacf03d7116cb1ff2bf5b21513..059e42fd74d2610face78efc4b994cbe3cb5bdc8 100644 (file)
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -2426,7 +2426,8 @@ interface Friendable {
  * @since 1.7
  */
 function elgg_http_build_url(array $parts) {
-       return "{$parts['scheme']}://{$parts['host']}{$parts['path']}?{$parts['query']}";
+       $port = (array_key_exists('port', $parts)) ? ":{$parts['port']}" : '';
+       return "{$parts['scheme']}://{$parts['host']}{$port}{$parts['path']}?{$parts['query']}";
 }
 
 /**
@@ -2439,11 +2440,11 @@ function elgg_http_build_url(array $parts) {
 function elgg_validate_action_url($link) {
        $url = parse_url($link);
        parse_str($url['query'], $query);
-       if (array_key_exists('__elgg_token', $query)) {
+       if (array_key_exists('__elgg_ts', $query) && array_key_exists('__elgg_token', $query)) {
                return $link;
        }
 
-       // apend action tokens to the existing query
+       // append action tokens to the existing query
        $query['__elgg_ts'] = time();
        $query['__elgg_token'] = generate_action_token($query['__elgg_ts']);
        $url['query'] = http_build_query($query);