diff options
| author | Sem <sembrestels@riseup.net> | 2011-12-31 20:14:45 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2011-12-31 20:14:45 +0100 |
| commit | 9f4da6d87f2c520b975f968cedbcde4f3dce1a25 (patch) | |
| tree | fee953cf498b6083faf56c61042d3bee07110331 /mod/thewire | |
| parent | a22660e997611fe2afb97689ea23774578ee80db (diff) | |
| parent | e49df853b2cc3a6a9bc2dd527a64951050142eb9 (diff) | |
| download | elgg-9f4da6d87f2c520b975f968cedbcde4f3dce1a25.tar.gz elgg-9f4da6d87f2c520b975f968cedbcde4f3dce1a25.tar.bz2 | |
Merge git://github.com/Elgg/Elgg
Diffstat (limited to 'mod/thewire')
| -rw-r--r-- | mod/thewire/pages/thewire/everyone.php | 3 | ||||
| -rw-r--r-- | mod/thewire/pages/thewire/friends.php | 2 | ||||
| -rw-r--r-- | mod/thewire/pages/thewire/owner.php | 2 | ||||
| -rw-r--r-- | mod/thewire/start.php | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/mod/thewire/pages/thewire/everyone.php b/mod/thewire/pages/thewire/everyone.php index 4e88d17af..909f0caf2 100644 --- a/mod/thewire/pages/thewire/everyone.php +++ b/mod/thewire/pages/thewire/everyone.php @@ -8,13 +8,14 @@ elgg_push_breadcrumb(elgg_echo('thewire')); $title = elgg_echo('thewire:everyone'); +$content = ''; if (elgg_is_logged_in()) { $form_vars = array('class' => 'thewire-form'); $content .= elgg_view_form('thewire/add', $form_vars); $content .= elgg_view('input/urlshortener'); } -$content = elgg_list_entities(array( +$content .= elgg_list_entities(array( 'type' => 'object', 'subtype' => 'thewire', 'limit' => 15, diff --git a/mod/thewire/pages/thewire/friends.php b/mod/thewire/pages/thewire/friends.php index 26ad03da6..e7f5eed59 100644 --- a/mod/thewire/pages/thewire/friends.php +++ b/mod/thewire/pages/thewire/friends.php @@ -14,7 +14,7 @@ elgg_push_breadcrumb(elgg_echo('thewire'), "thewire/all"); elgg_push_breadcrumb($owner->name, "thewire/owner/$owner->username"); elgg_push_breadcrumb(elgg_echo('friends')); -if (get_loggedin_userid() == $owner->guid) { +if (elgg_get_logged_in_user_guid() == $owner->guid) { $form_vars = array('class' => 'thewire-form'); $content = elgg_view_form('thewire/add', $form_vars); $content .= elgg_view('input/urlshortener'); diff --git a/mod/thewire/pages/thewire/owner.php b/mod/thewire/pages/thewire/owner.php index a95786b0a..f544aa655 100644 --- a/mod/thewire/pages/thewire/owner.php +++ b/mod/thewire/pages/thewire/owner.php @@ -14,7 +14,7 @@ $title = elgg_echo('thewire:user', array($owner->name)); elgg_push_breadcrumb(elgg_echo('thewire'), "thewire/all"); elgg_push_breadcrumb($owner->name); -if (get_loggedin_userid() == $owner->guid) { +if (elgg_get_logged_in_user_guid() == $owner->guid) { $form_vars = array('class' => 'thewire-form'); $content = elgg_view_form('thewire/add', $form_vars); $content .= elgg_view('input/urlshortener'); diff --git a/mod/thewire/start.php b/mod/thewire/start.php index c0890344f..328e5d46c 100644 --- a/mod/thewire/start.php +++ b/mod/thewire/start.php @@ -217,7 +217,7 @@ function thewire_filter($text) { // usernames $text = preg_replace( - '/(^|[^\w])@([\w]+)/', + '/(^|[^\w])@([\w.]+)/', '$1<a href="' . $CONFIG->wwwroot . 'thewire/owner/$2">@$2</a>', $text); |