From 990f700c35ac151caec14d3553ad4e4aff79ce58 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Wed, 16 Nov 2011 20:29:25 -0500
Subject: removed two deprecated function calls from thewire

---
 mod/thewire/pages/thewire/friends.php | 2 +-
 mod/thewire/pages/thewire/owner.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'mod/thewire')

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');
-- 
cgit v1.2.3


From 43b42bd3b727c75308bc0dc1a663ecdb0882ba77 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Thu, 17 Nov 2011 07:12:39 -0500
Subject: Fixes #4100 adds the wire post form back to all page

---
 mod/thewire/pages/thewire/everyone.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'mod/thewire')

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,
-- 
cgit v1.2.3


From b12039be030a54fa05dc3758254542075b130f34 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Fri, 18 Nov 2011 21:35:15 -0500
Subject: Fixes #4085 accepting . in usernames for the wire

---
 mod/thewire/start.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/thewire')

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);
 
-- 
cgit v1.2.3