aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-06-03 16:39:00 +0000
committernickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-06-03 16:39:00 +0000
commite69166b89f2fac270b07d30b172da67e6d36676f (patch)
tree41007016bc2114f76870c8f692a8ffec73842424
parent43f62a08e490728dc5505e6288188b166cc7e15f (diff)
downloadelgg-e69166b89f2fac270b07d30b172da67e6d36676f.tar.gz
elgg-e69166b89f2fac270b07d30b172da67e6d36676f.tar.bz2
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
-rw-r--r--mod/thewire/views/default/object/thewire.php2
-rw-r--r--mod/thewire/views/default/river/object/thewire/create.php4
2 files changed, 3 insertions, 3 deletions
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>";