wallwall oddities on display page

4 files changed, 8 insertions, 3 deletions

diff --git a/boot.php b/boot.php
index 7dfaa021e..7b6850592 100644
--- a/boot.php
+++ b/boot.php
@@ -201,6 +201,7 @@ class App {
 	public  $user;
 	public  $cid;
 	public  $contact;
+	public  $page_contact;
 	public  $content;
 	public  $data;
 	public  $error = false;
diff --git a/include/conversation.php b/include/conversation.php
index d6a439a53..3f8ea4196 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -240,9 +240,9 @@ function conversation(&$a, $items, $mode, $update) {
 
 				if($item['type'] === 'wall') {
 					// I do. Put me on the left of the wall-to-wall notice.
-					$owner_url = $a->contact['url'];
-					$owner_photo = $a->contact['thumb'];
-					$owner_name = $a->contact['name'];
+					$owner_url = $a->page_contact['url'];
+					$owner_photo = $a->page_contact['thumb'];
+					$owner_name = $a->page_contact['name'];
 					$template = $wallwall;
 					$commentww = 'ww';	
 				}
diff --git a/mod/display.php b/mod/display.php
index dd880907e..b47346c4b 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -45,6 +45,7 @@ function display_content(&$a) {
 		}
 	}
 
+	$a->page_contact = $contact;
 
 	$sql_extra = "
 		AND `allow_cid` = '' 
diff --git a/mod/network.php b/mod/network.php
index 29b852c07..1b5ea5d65 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -262,6 +262,9 @@ function network_content(&$a, $update = 0) {
 		}
 	}
 
+	// Set this so that the conversation function can find out contact info for our wall-wall items
+	$a->page_contact = $a->contact;
+
 	$mode = (($nouveau) ? 'network-new' : 'network');
 
 	require_once('include/conversation.php');