friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Removing the parameter

pull/6541/head
Michael 2019-01-28 21:53:13 +00:00
parent d40b2792b6
commit d259007f11
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Object/Post.php
View File

@ -771,13 +771,11 @@ class Post extends BaseObject
/** /**
* Get default text for the comment box * Get default text for the comment box
* *
* @param integer $parent_id ID of the parent item
*
* @return string * @return string
*/ */
private function getDefaultText($parent_id) private function getDefaultText()
{ {
$item = Item::selectFirst(['author-addr'], ['id' => $parent_id]); $item = Item::selectFirst(['author-addr'], ['id' => $this->getId()]);
if (!DBA::isResult($item) || empty($item['author-addr'])) { if (!DBA::isResult($item) || empty($item['author-addr'])) {
// Should not happen // Should not happen
return ''; return '';
@ -785,7 +783,7 @@ class Post extends BaseObject
$text = '@'.$item['author-addr'].' '; $text = '@'.$item['author-addr'].' ';
$terms = Term::tagArrayFromItemId($parent_id, TERM_MENTION); $terms = Term::tagArrayFromItemId($this->getId(), TERM_MENTION);
foreach ($terms as $term) { foreach ($terms as $term) {
$profile = Contact::getDetailsByURL($term['url']); $profile = Contact::getDetailsByURL($term['url']);
@ -833,7 +831,7 @@ class Post extends BaseObject
$uid = $conv->getProfileOwner(); $uid = $conv->getProfileOwner();
$parent_uid = $this->getDataValue('uid'); $parent_uid = $this->getDataValue('uid');
$default_text = $this->getDefaultText($this->getId()); $default_text = $this->getDefaultText();
if (!is_null($parent_uid) && ($uid != $parent_uid)) { if (!is_null($parent_uid) && ($uid != $parent_uid)) {
$uid = $parent_uid; $uid = $parent_uid;