bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Move (last) get_cats_and_terms to Content\Item::determineCategoriesTerms()

Browse source 
- Added incomplete test
This commit is contained in:
Philipp Holzer 2019-10-23 02:48:46 +02:00
commit edf006905b
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
5 changed files with 102 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/conversation.php
View file

@ -7,6 +7,7 @@ use Friendica\App;
use Friendica\BaseObject;
use Friendica\Content\ContactSelector;
use Friendica\Content\Feature;
use Friendica\Content\Item as ContentItem;
use Friendica\Content\Pager;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Config;
@ -671,7 +672,10 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
$body = Item::prepareBody($item, true, $preview);
list($categories, $folders) = get_cats_and_terms($item);
/** @var ContentItem $contItem */
$contItem = BaseObject::getClass(ContentItem::class);
list($categories, $folders) = $contItem->determineCategoriesTerms($item);
if (!empty($item['content-warning']) && PConfig::get(local_user(), 'system', 'disable_cw', false)) {
$title = ucfirst($item['content-warning']);