nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Finish renaming Object\Item to Object\Post

Browse source
This commit is contained in:
Hypolite Petovan 2017-12-07 23:33:36 -05:00
parent 0dce57d400
commit 4b0f83a12b
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/conversation.php
View file

@ -8,9 +8,9 @@ use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Object\Contact; use Friendica\Model\Contact;
use Friendica\Object\Conversation; use Friendica\Object\Thread;
use Friendica\Object\Item; use Friendica\Object\Post;
require_once "include/bbcode.php"; require_once "include/bbcode.php";
require_once "include/acl_selectors.php"; require_once "include/acl_selectors.php";
@ -880,8 +880,8 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
$item['pagedrop'] = $page_dropping; $item['pagedrop'] = $page_dropping;
if ($item['id'] == $item['parent']) { if ($item['id'] == $item['parent']) {
$item_object = new Item($item); $item_object = new Post($item);
$conv->addThread($item_object); $conv->addParent($item_object);
} }
} }

4
src/Object/Conversation.php
View file

@ -5,7 +5,7 @@
namespace Friendica\Object; namespace Friendica\Object;
use Friendica\BaseObject; use Friendica\BaseObject;
use Friendica\Object\Item; use Friendica\Object\Post;
require_once 'boot.php'; require_once 'boot.php';
require_once 'include/text.php'; require_once 'include/text.php';
@ -120,7 +120,7 @@ class Conversation extends BaseObject
* @return mixed The inserted item on success * @return mixed The inserted item on success
* false on failure * false on failure
*/ */
public function addThread($item) public function addParent(Post $item)
{ {
$item_id = $item->getId(); $item_id = $item->getId();

2
src/Object/Item.php
View file

@ -46,7 +46,7 @@ class Item extends BaseObject
* *
* @param array $data data array * @param array $data data array
*/ */
public function __construct($data) public function __construct(array $data)
{ {
$a = self::getApp(); $a = self::getApp();