keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wallwall oddities on display page

Browse source
This commit is contained in:
Friendika 2011-04-11 16:15:38 -07:00
parent 68731a2c39
commit a4836ac1ba
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
boot.php
View file

@ -201,6 +201,7 @@ class App {
public $user; public $user;
public $cid; public $cid;
public $contact; public $contact;
public $page_contact;
public $content; public $content;
public $data; public $data;
public $error = false; public $error = false;

6
include/conversation.php
View file

@ -240,9 +240,9 @@ function conversation(&$a, $items, $mode, $update) {
if($item['type'] === 'wall') { if($item['type'] === 'wall') {
// I do. Put me on the left of the wall-to-wall notice. // I do. Put me on the left of the wall-to-wall notice.
$owner_url = $a->contact['url']; $owner_url = $a->page_contact['url'];
$owner_photo = $a->contact['thumb']; $owner_photo = $a->page_contact['thumb'];
$owner_name = $a->contact['name']; $owner_name = $a->page_contact['name'];
$template = $wallwall; $template = $wallwall;
$commentww = 'ww'; $commentww = 'ww';
} }

1
mod/display.php
View file

@ -45,6 +45,7 @@ function display_content(&$a) {
} }
} }
$a->page_contact = $contact;
$sql_extra = " $sql_extra = "
AND `allow_cid` = '' AND `allow_cid` = ''

3
mod/network.php
View file

@ -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'); $mode = (($nouveau) ? 'network-new' : 'network');
require_once('include/conversation.php'); require_once('include/conversation.php');