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

Add ability for themes to prevent threading (see friendica/friendica@5e09fc31f5)

This commit is contained in:
Domovoy 2012-08-18 17:49:07 +02:00
parent 8efe4077d3
commit fd29ab9629
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
object/Item.php
View File

@ -216,7 +216,7 @@ class Item extends BaseObject {
'vote' => $buttons,
'like' => $like,
'dislike' => $dislike,
'comment' => $this->get_comment_box(),
'comment' => $this->get_comment_box($indent),
'previewing' => $previewing,
'wait' => t('Please wait'),
);
@ -250,7 +250,7 @@ class Item extends BaseObject {
$result['private'] = $item['private'];
$result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');
if(get_config('system','thread_allow')) {
if(get_config('system','thread_allow') && $a->theme_thread_allow) {
$result['flatten'] = false;
$result['threaded'] = true;
}
@ -464,7 +464,7 @@ class Item extends BaseObject {
* _ The comment box string (empty if no comment box)
* _ false on failure
*/
private function get_comment_box() {
private function get_comment_box($indent) {
if(!$this->is_toplevel() && !get_config('system','thread_allow')) {
return '';
}
@ -510,6 +510,7 @@ class Item extends BaseObject {
'$edurl' => t('Link'),
'$edvideo' => t('Video'),
'$preview' => t('Preview'),
'$indent' => $indent,
'$sourceapp' => t($a->sourcename),
'$ww' => (($conv->get_mode() === 'network') ? $ww : '')
));