mirror of
https://github.com/friendica/friendica
synced 2024-12-23 16:00:16 +00:00
Port friendica/friendica#79012bf8882baa6843726bcffbcafe959028c1bd
This commit is contained in:
parent
bb68461c6d
commit
1b82df60db
3 changed files with 12 additions and 3 deletions
|
@ -909,7 +909,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
||||||
require_once('object/Conversation.php');
|
require_once('object/Conversation.php');
|
||||||
require_once('object/Item.php');
|
require_once('object/Item.php');
|
||||||
|
|
||||||
$conv = new Conversation($mode);
|
$conv = new Conversation($mode, $preview);
|
||||||
|
|
||||||
// get all the topmost parents
|
// get all the topmost parents
|
||||||
// this shouldn't be needed, as we should have only them in our array
|
// this shouldn't be needed, as we should have only them in our array
|
||||||
|
|
|
@ -17,9 +17,11 @@ class Conversation extends BaseObject {
|
||||||
private $mode = null;
|
private $mode = null;
|
||||||
private $writable = false;
|
private $writable = false;
|
||||||
private $profile_owner = 0;
|
private $profile_owner = 0;
|
||||||
|
private $preview = false;
|
||||||
|
|
||||||
public function __construct($mode) {
|
public function __construct($mode, $preview) {
|
||||||
$this->set_mode($mode);
|
$this->set_mode($mode);
|
||||||
|
$this->preview = $preview;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -67,6 +69,13 @@ class Conversation extends BaseObject {
|
||||||
return $this->writable;
|
return $this->writable;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if page is a preview
|
||||||
|
*/
|
||||||
|
public function is_preview() {
|
||||||
|
return $this->preview;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get profile owner
|
* Get profile owner
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -222,7 +222,7 @@ class Item extends BaseObject {
|
||||||
'like' => $like,
|
'like' => $like,
|
||||||
'dislike' => $dislike,
|
'dislike' => $dislike,
|
||||||
'comment' => $this->get_comment_box($indent),
|
'comment' => $this->get_comment_box($indent),
|
||||||
'previewing' => $previewing,
|
'previewing' => ($conv->is_preview() ? ' preview ' : ''),
|
||||||
'wait' => t('Please wait'),
|
'wait' => t('Please wait'),
|
||||||
'thread_level' => $thread_level
|
'thread_level' => $thread_level
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in a new issue