diff options
Diffstat (limited to 'mod/thewire/views')
| -rw-r--r-- | mod/thewire/views/default/object/thewire.php | 2 | ||||
| -rw-r--r-- | mod/thewire/views/default/river/object/thewire/create.php | 4 |
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>"; |