keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Style again

Browse source
This commit is contained in:
Michael 2021-09-24 04:46:30 +00:00
parent 64d181c1cc
commit 8fd8241797
1 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Content/Conversation.php
View file

@ -192,7 +192,8 @@ class Conversation
* @return string formatted text * @return string formatted text
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public function formatActivity(array $links, $verb, $id) { public function formatActivity(array $links, $verb, $id)
{
$this->profiler->startRecording('rendering'); $this->profiler->startRecording('rendering');
$o = ''; $o = '';
$expanded = ''; $expanded = '';
@ -686,7 +687,7 @@ class Conversation
'like_html' => '', 'like_html' => '',
'dislike_html ' => '', 'dislike_html ' => '',
'comment_html' => '', 'comment_html' => '',
'conv' => (($preview) ? '' : ['href'=> 'display/'.$item['guid'], 'title'=> $this->l10n->t('View in context')]), 'conv' => ($preview ? '' : ['href' => 'display/' . $item['guid'], 'title'=> $this->l10n->t('View in context')]),
'previewing' => $previewing, 'previewing' => $previewing,
'wait' => $this->l10n->t('Please wait'), 'wait' => $this->l10n->t('Please wait'),
'thread_level' => 1, 'thread_level' => 1,
@ -756,7 +757,7 @@ class Conversation
'$mode' => $mode, '$mode' => $mode,
'$update' => $update, '$update' => $update,
'$threads' => $threads, '$threads' => $threads,
'$dropping' => ($page_dropping ? $this->l10n->t('Delete Selected Items') : False), '$dropping' => ($page_dropping ? $this->l10n->t('Delete Selected Items') : false),
]); ]);
$this->profiler->stopRecording(); $this->profiler->stopRecording();
@ -794,7 +795,8 @@ class Conversation
* *
* @return array items with parents and comments * @return array items with parents and comments
*/ */
private function addRowInformation(array $row, array $activity) { private function addRowInformation(array $row, array $activity)
{
$this->profiler->startRecording('rendering'); $this->profiler->startRecording('rendering');
if ($row['uid'] == 0) { if ($row['uid'] == 0) {
@ -886,7 +888,8 @@ class Conversation
* @return array items with parents and comments * @return array items with parents and comments
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
private function addChildren(array $parents, $block_authors, $order, $uid) { private function addChildren(array $parents, $block_authors, $order, $uid)
{
$this->profiler->startRecording('rendering'); $this->profiler->startRecording('rendering');
if (count($parents) > 1) { if (count($parents) > 1) {
$max_comments = $this->config->get('system', 'max_comments', 100); $max_comments = $this->config->get('system', 'max_comments', 100);
@ -980,6 +983,7 @@ class Conversation
if ($thr_parent == $parent['uri-id']) { if ($thr_parent == $parent['uri-id']) {
$item['children'] = $this->getItemChildren($item_list, $item); $item['children'] = $this->getItemChildren($item_list, $item);
$children[] = $item; $children[] = $item;
unset($item_list[$i]); unset($item_list[$i]);
} }
@ -1144,8 +1148,7 @@ class Conversation
* items and add them as children of their top-level post. * items and add them as children of their top-level post.
*/ */
foreach ($parents as $i => $parent) { foreach ($parents as $i => $parent) {
$parents[$i]['children'] = $parents[$i]['children'] = array_merge($this->getItemChildren($item_array, $parent, true),
array_merge($this->getItemChildren($item_array, $parent, true),
$this->getItemChildren($item_array, $parent, false)); $this->getItemChildren($item_array, $parent, false));
} }