friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Move Item and Conversation from Core to Object 

- Move BaseObject from Core\ to Friendica\
This commit is contained in:
Hypolite Petovan 2017-11-19 16:50:49 -05:00
parent 1f38deb77b
commit f43aaf5227
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/conversation.php
View File

@ -4,11 +4,11 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\Conversation;
use Friendica\Core\Item;
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\Conversation;
use Friendica\Object\Item;
require_once "include/bbcode.php"; require_once "include/bbcode.php";
require_once "include/acl_selectors.php"; require_once "include/acl_selectors.php";

2
index.php
View File

@ -9,7 +9,7 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\BaseObject; use Friendica\BaseObject;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\Worker; use Friendica\Core\Worker;

8
src/Core/BaseObject.php → src/BaseObject.php
View File

@ -1,8 +1,8 @@
<?php <?php
/** /**
* @file src/Core/BaseObject.php * @file src/BaseObject.php
*/ */
namespace Friendica\Core; namespace Friendica;
require_once 'boot.php'; require_once 'boot.php';
@ -22,13 +22,13 @@ class BaseObject
* *
* @return object * @return object
*/ */
public function getApp() public static function getApp()
{ {
if (self::$app) { if (self::$app) {
return self::$app; return self::$app;
} }
self::$app = boot::get_app(); self::$app = get_app();
return self::$app; return self::$app;
} }

12
src/Core/Conversation.php → src/Object/Conversation.php
View File

@ -1,11 +1,11 @@
<?php <?php
/** /**
* @file src/Core/Conversation.php * @file src/Object/Conversation.php
*/ */
namespace Friendica\Core; namespace Friendica\Object;
use Friendica\Core\BaseObject; use Friendica\BaseObject;
use Friendica\Core\Item; use Friendica\Object\Item;
require_once 'boot.php'; require_once 'boot.php';
require_once 'include/text.php'; require_once 'include/text.php';
@ -48,7 +48,7 @@ class Conversation extends BaseObject
return; return;
} }
$a = $this->getApp(); $a = self::getApp();
switch ($mode) { switch ($mode) {
case 'network': case 'network':
@ -165,7 +165,7 @@ class Conversation extends BaseObject
*/ */
public function getTemplateData($conv_responses) public function getTemplateData($conv_responses)
{ {
$a = get_app(); $a = self::getApp();
$result = array(); $result = array();
$i = 0; $i = 0;

20
src/Core/Item.php → src/Object/Item.php
View File

@ -1,14 +1,14 @@
<?php <?php
/** /**
* @file src/Core/Item.php * @file src/Object/Item.php
*/ */
namespace Friendica\Core; namespace Friendica\Object;
use Friendica\Core\BaseObject; use Friendica\BaseObject;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Protocol\Diaspora; use Friendica\Object\Contact;
use dba; use dba;
require_once 'include/text.php'; require_once 'include/text.php';
@ -46,7 +46,7 @@ class Item extends BaseObject
*/ */
public function __construct($data) public function __construct($data)
{ {
$a = $this->getApp(); $a = self::getApp();
$this->data = $data; $this->data = $data;
$this->setTemplate('wall'); $this->setTemplate('wall');
@ -109,7 +109,7 @@ class Item extends BaseObject
$result = array(); $result = array();
$a = $this->getApp(); $a = self::getApp();
$item = $this->getData(); $item = $this->getData();
$edited = false; $edited = false;
@ -186,7 +186,7 @@ class Item extends BaseObject
} }
if (!isset($item['author-thumb']) || ($item['author-thumb'] == "")) { if (!isset($item['author-thumb']) || ($item['author-thumb'] == "")) {
$author_contact = get_contact_details_by_url($item['author-link'], $conv->getProfileOwner()); $author_contact = Contact::getDetailsByURL($item['author-link'], $conv->getProfileOwner());
if ($author_contact["thumb"]) { if ($author_contact["thumb"]) {
$item['author-thumb'] = $author_contact["thumb"]; $item['author-thumb'] = $author_contact["thumb"];
} else { } else {
@ -195,7 +195,7 @@ class Item extends BaseObject
} }
if (!isset($item['owner-thumb']) || ($item['owner-thumb'] == "")) { if (!isset($item['owner-thumb']) || ($item['owner-thumb'] == "")) {
$owner_contact = get_contact_details_by_url($item['owner-link'], $conv->getProfileOwner()); $owner_contact = Contact::getDetailsByURL($item['owner-link'], $conv->getProfileOwner());
if ($owner_contact["thumb"]) { if ($owner_contact["thumb"]) {
$item['owner-thumb'] = $owner_contact["thumb"]; $item['owner-thumb'] = $owner_contact["thumb"];
} else { } else {
@ -752,7 +752,7 @@ class Item extends BaseObject
*/ */
private function getCommentBox($indent) private function getCommentBox($indent)
{ {
$a = $this->getApp(); $a = self::getApp();
if (!$this->isToplevel() && !(Config::get('system', 'thread_allow') && $a->theme_thread_allow)) { if (!$this->isToplevel() && !(Config::get('system', 'thread_allow') && $a->theme_thread_allow)) {
return ''; return '';
} }
@ -828,7 +828,7 @@ class Item extends BaseObject
*/ */
protected function checkWallToWall() protected function checkWallToWall()
{ {
$a = $this->getApp(); $a = self::getApp();
$conv = $this->getConversation(); $conv = $this->getConversation();
$this->wall_to_wall = false; $this->wall_to_wall = false;