aboutsummaryrefslogtreecommitdiff
path: root/views/default/output
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-05 15:11:05 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-05 15:11:05 +0000
commit5571ca5b350fd1735f13af7ddfbb88afa6befb0c (patch)
treef8f2c4e1705a3edd6ec5d759f188926f7495021c /views/default/output
parent394f52f0ef0d743cb50352fce14020837662d891 (diff)
downloadelgg-5571ca5b350fd1735f13af7ddfbb88afa6befb0c.tar.gz
elgg-5571ca5b350fd1735f13af7ddfbb88afa6befb0c.tar.bz2
Merged 5487:5525 from 1.7 to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@5621 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/output')
-rw-r--r--views/default/output/url.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/views/default/output/url.php b/views/default/output/url.php
index 734df2c19..7e0281a43 100644
--- a/views/default/output/url.php
+++ b/views/default/output/url.php
@@ -20,6 +20,10 @@
$url = trim($vars['href']);
if (!empty($url)) {
+ if ((substr_count($url, "http://") == 0) && (substr_count($url, "https://") == 0)) {
+ $url = "http://" . $url;
+ }
+
if (array_key_exists('is_action', $vars) && $vars['is_action']) {
$url = elgg_add_action_tokens_to_url($url);
}