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

fix theme control of allowing threading

Browse source
This commit is contained in:
Zach Prezkuta 2012-11-01 10:33:01 -06:00
commit d98974572b
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/conversation.php
View file

@ -1008,9 +1008,10 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
function get_item_children($arr, $parent) {
$children = array();
$a = get_app();
foreach($arr as $item) {
if($item['id'] != $item['parent']) {
if(get_config('system','thread_allow')) {
if(get_config('system','thread_allow') && $a->theme_thread_allow) {
// Fallback to parent-uri if thr-parent is not set
$thr_parent = $item['thr-parent'];
if($thr_parent == '')

4
object/Item.php
View file

@ -519,7 +519,8 @@ class Item extends BaseObject {
* _ false on failure
*/
private function get_comment_box($indent) {
if(!$this->is_toplevel() && !get_config('system','thread_allow')) {
$a = $this->get_app();
if(!$this->is_toplevel() && !(get_config('system','thread_allow') && $a->theme_thread_allow)) {
return '';
}
@ -531,7 +532,6 @@ class Item extends BaseObject {
$ww = 'ww';
if($conv->is_writable() && $this->is_writable()) {
$a = $this->get_app();
$qc = $qcomment = null;
/*

10
results Normal file
View file

File diff suppressed because one or more lines are too long