diff options
| author | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-02 20:16:13 +0000 |
|---|---|---|
| committer | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-02 20:16:13 +0000 |
| commit | b314a9a072d301e2e89c4873d76429ba46e9c94a (patch) | |
| tree | 1897dba2a7dd360d8487c17d63d0b621e982b4e0 /views/default/output | |
| parent | 7dd19a4cb04803f4d05fcd109b3149c6926b6558 (diff) | |
| download | elgg-b314a9a072d301e2e89c4873d76429ba46e9c94a.tar.gz elgg-b314a9a072d301e2e89c4873d76429ba46e9c94a.tar.bz2 | |
Refs #2463: Added url normalization support to output/url, output/confirmlink. Enhanced normalization to take care of urls like "example.com"
git-svn-id: http://code.elgg.org/elgg/trunk@7199 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/output')
| -rw-r--r-- | views/default/output/confirmlink.php | 2 | ||||
| -rw-r--r-- | views/default/output/url.php | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/views/default/output/confirmlink.php b/views/default/output/confirmlink.php index d7bb5c56f..4d1bc0ab9 100644 --- a/views/default/output/confirmlink.php +++ b/views/default/output/confirmlink.php @@ -18,7 +18,7 @@ if (!$confirm) { } // always generate missing action tokens -$link = elgg_add_action_tokens_to_url($vars['href']); +$link = elgg_add_action_tokens_to_url(elgg_normalize_url($vars['href'])); if (isset($vars['class']) && $vars['class']) { $class = 'class="' . $vars['class'] . '"'; diff --git a/views/default/output/url.php b/views/default/output/url.php index 9dd0bf3f5..2a01e32d0 100644 --- a/views/default/output/url.php +++ b/views/default/output/url.php @@ -51,9 +51,7 @@ if (!empty($url)) { $text = htmlentities($url, ENT_QUOTES, 'UTF-8'); } - if ((substr_count($url, "http://") == 0) && (substr_count($url, "https://") == 0)) { - $url = "http://" . $url; - } + $url = elgg_normalize_url($url); if (isset($vars['is_action'])) { $url = elgg_add_action_tokens_to_url($url); |