aboutsummaryrefslogtreecommitdiff
path: root/mod/thewire/views/default
diff options
context:
space:
mode:
authordave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-06-30 11:19:49 +0000
committerdave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-06-30 11:19:49 +0000
commitd3efc6c117d43e651a7e4e85162237311f5816cf (patch)
tree7dc261a44342b028c694f5a027495c841f24f892 /mod/thewire/views/default
parent5c8758d8e30e8a3d4ac64b129924124881810961 (diff)
downloadelgg-d3efc6c117d43e651a7e4e85162237311f5816cf.tar.gz
elgg-d3efc6c117d43e651a7e4e85162237311f5816cf.tar.bz2
wire links will now work in the activity river
git-svn-id: https://code.elgg.org/elgg/trunk@3367 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/thewire/views/default')
-rw-r--r--mod/thewire/views/default/river/object/thewire/create.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index df381d7f7..2c1bb159d 100644
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -5,8 +5,10 @@
$url = $object->getURL();
$string = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}:</a> ";
- $string .= $object->description;
-
+ $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 .= " (<a href=\"{$vars['url']}mod/thewire/add.php?wire_username={$object->getOwnerEntity()->username}\" class=\"reply\">" . elgg_echo('thewire:reply') . "</a>)";
?>