Fixes #3411 output/url now has a is_trusted parameter - defaults to false

4 files changed, 9 insertions, 1 deletions

diff --git a/views/default/navigation/breadcrumbs.php b/views/default/navigation/breadcrumbs.php
index bad73c4b3..88577a8ff 100644
--- a/views/default/navigation/breadcrumbs.php
+++ b/views/default/navigation/breadcrumbs.php
@@ -30,6 +30,7 @@ if (is_array($breadcrumbs) && count($breadcrumbs) > 0) {
 			$crumb = elgg_view('output/url', array(
 				'href' => $breadcrumb['link'],
 				'text' => $breadcrumb['title'],
+				'is_trusted' => true,
 			));
 		} else {
 			$crumb = $breadcrumb['title'];
diff --git a/views/default/navigation/menu/user_hover.php b/views/default/navigation/menu/user_hover.php
index e32e5ab57..5c89e585c 100644
--- a/views/default/navigation/menu/user_hover.php
+++ b/views/default/navigation/menu/user_hover.php
@@ -19,6 +19,7 @@ echo '<ul class="elgg-menu elgg-menu-hover">';
 $name_link = elgg_view('output/url', array(
 	'href' => $user->getURL(),
 	'text' => "<span class=\"elgg-heading-basic\">$user->name</span>&#64;$user->username",
+	'is_trusted' => true,
 ));
 echo "<li>$name_link</li>";
 
diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php
index c0cb801dd..4df5cf575 100644
--- a/views/default/navigation/pagination.php
+++ b/views/default/navigation/pagination.php
@@ -42,10 +42,12 @@ $pages = new stdClass();
 $pages->prev = array(
 	'text' => '&laquo; ' . elgg_echo('previous'),
 	'href' => '',
+	'is_trusted' => true,
 );
 $pages->next = array(
 	'text' => elgg_echo('next') . ' &raquo;',
 	'href' => '',
+	'is_trusted' => true,
 );
 $pages->items = array();
 
diff --git a/views/default/navigation/tabs.php b/views/default/navigation/tabs.php
index 0108126ad..e8fde3579 100644
--- a/views/default/navigation/tabs.php
+++ b/views/default/navigation/tabs.php
@@ -47,7 +47,7 @@ if (isset($vars['tabs']) && is_array($vars['tabs']) && !empty($vars['tabs'])) {
 		$options = array(
 			'href' => $url,
 			'title' => $title,
-			'text' => $title
+			'text' => $title,
 		);
 
 		if (isset($info['url_class'])) {
@@ -58,6 +58,10 @@ if (isset($vars['tabs']) && is_array($vars['tabs']) && !empty($vars['tabs'])) {
 			$options['id'] = $info['url_id'];
 		}
 
+		if (!isset($info['rel']) && !isset($info['is_trusted'])) {
+			$options['is_trusted'] = true;
+		}
+
 		$link = elgg_view('output/url', $options);
 
 		echo "<li $class_str $js>$link</li>";