aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-04-11 16:15:38 -0700
committerFriendika <info@friendika.com>2011-04-11 16:15:38 -0700
commita4836ac1ba1c92f54d286621592f3f332603ff07 (patch)
tree8160c71b88a24628fb4f5f00a61f7b06c77917d7
parent68731a2c39ea0b235e5f715315243feda18b8d1c (diff)
downloadvolse-hubzilla-a4836ac1ba1c92f54d286621592f3f332603ff07.tar.gz
volse-hubzilla-a4836ac1ba1c92f54d286621592f3f332603ff07.tar.bz2
volse-hubzilla-a4836ac1ba1c92f54d286621592f3f332603ff07.zip
wallwall oddities on display page
-rw-r--r--boot.php1
-rw-r--r--include/conversation.php6
-rw-r--r--mod/display.php1
-rw-r--r--mod/network.php3
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');