From e69166b89f2fac270b07d30b172da67e6d36676f Mon Sep 17 00:00:00 2001
From: nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 3 Jun 2010 16:39:00 +0000
Subject: Updating views to no longer parse usernames as this is handled
 directly thru Mentions.

git-svn-id: http://code.elgg.org/elgg/trunk@6346 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/thewire/views/default/object/thewire.php              | 2 +-
 mod/thewire/views/default/river/object/thewire/create.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'mod/thewire')

diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index b84a74779..170c0484a 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -52,7 +52,7 @@ if (isset($vars['entity'])) {
 			<a href="<?php echo $vars['url']; ?>pg/thewire/<?php echo $vars['entity']->getOwnerEntity()->username; ?>"><?php echo $user_name; ?></a>
 			<?php
 			    $desc = $vars['entity']->description;
-			    $desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . $vars['url'] . 'pg/thewire/$1">$1</a>',$desc);
+			    //$desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . $vars['url'] . 'pg/thewire/$1">$1</a>',$desc);
 				echo parse_urls($desc);
 			?>
 			<p class="entity_subtext">		
diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index 5308e7ba9..2366abc4c 100644
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -5,8 +5,8 @@
 	$url = $object->getURL();
 
 	$string = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}:</a> ";
-	$desc .= $object->description;
-	$desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . $vars['url'] . 'pg/thewire/$1">$1</a>',$desc);
+	$desc = $object->description;
+	//$desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . $vars['url'] . 'pg/thewire/$1">$1</a>',$desc);
 	$string .= parse_urls($desc);
 
 	$string .= " <span class='entity_subtext'>" . friendly_time($object->time_created) . "</span> <a href=\"{$vars['url']}mod/thewire/add.php?wire_username={$object->getOwnerEntity()->username}\" class='reply_link'>" . elgg_echo('thewire:reply') . "</a>";
-- 
cgit v1.2.3