wallwall oddities on display page

diff --git a/boot.php b/boot.php
index 7dfaa021ee7743cb35df845166e938fa741b5c2e..7b68505925051f10673e0d8ac07a489e0672570b 100644 (file)
--- 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 d6a439a5365d3524288e5116962ef9bcd3464057..3f8ea419651c9f794459ca8458edd2f07b6b4ef7 100644 (file)
--- 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 dd880907e020e2383f66517e42013aaf325e159a..b47346c4baae6a7e758aefce7c238cc8ef5b6fa5 100644 (file)
--- 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 29b852c07f725c848545335720002792aae74569..1b5ea5d651d8ffd326ccf2f7565f65258010ad94 100644 (file)
--- 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');