mirror of
https://github.com/friendica/friendica
synced 2024-12-22 22:40:16 +00:00
wallwall oddities on display page
This commit is contained in:
parent
68731a2c39
commit
a4836ac1ba
4 changed files with 8 additions and 3 deletions
1
boot.php
1
boot.php
|
@ -201,6 +201,7 @@ class App {
|
|||
public $user;
|
||||
public $cid;
|
||||
public $contact;
|
||||
public $page_contact;
|
||||
public $content;
|
||||
public $data;
|
||||
public $error = false;
|
||||
|
|
|
@ -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';
|
||||
}
|
||||
|
|
|
@ -45,6 +45,7 @@ function display_content(&$a) {
|
|||
}
|
||||
}
|
||||
|
||||
$a->page_contact = $contact;
|
||||
|
||||
$sql_extra = "
|
||||
AND `allow_cid` = ''
|
||||
|
|
|
@ -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');
|
||||
|
|
Loading…
Reference in a new issue