Merged [5623]:head from 1.7 to trunk.

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

1 files changed, 16 insertions, 13 deletions

diff --git a/mod/categories/views/default/categories/view.php b/mod/categories/views/default/categories/view.php
index ef092ce84..7ee0170d9 100644
--- a/mod/categories/views/default/categories/view.php
+++ b/mod/categories/views/default/categories/view.php
@@ -1,19 +1,22 @@
 <?php
 
-	$linkstr = '';
-	if (isset($vars['entity']) && $vars['entity'] instanceof ElggEntity) {
-		
-		$categories = $vars['entity']->universal_categories;
-		if (!empty($categories)) {
-			if (!is_array($categories)) $categories = array($categories);
-			foreach($categories as $category) {
-				$link = $vars['url'] . 'search?tagtype=universal_categories&tag=' . urlencode($category);
-				if (!empty($linkstr)) $linkstr .= ', ';
-				$linkstr .= '<a href="'.$link.'">' . $category . '</a>';
+$linkstr = '';
+if (isset($vars['entity']) && $vars['entity'] instanceof ElggEntity) {
+
+	$categories = $vars['entity']->universal_categories;
+	if (!empty($categories)) {
+		if (!is_array($categories)) {
+			$categories = array($categories);
+		}
+		foreach($categories as $category) {
+			$link = $vars['url'] . 'pg/categories/list/?category=' . urlencode($category);
+			if (!empty($linkstr)) {
+				$linkstr .= ', ';
 			}
+			$linkstr .= '<a href="'.$link.'">' . $category . '</a>';
 		}
-		
 	}
-	echo $linkstr;
 
-?>
\ No newline at end of file
+}
+
+echo $linkstr;