Skip to content

Commit 59f3111

Browse files
author
RedEnchilada
committed
Make old timeline style the default
1 parent 7f9e35a commit 59f3111

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

actions/oldschoolsettings.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ function handlePost()
109109
$osp->created = common_sql_now();
110110
}
111111

112-
$osp->stream_mode_only = $this->boolean('stream_mode_only');
113-
$osp->conversation_tree = $this->boolean('conversation_tree');
112+
$osp->stream_mode_only = !$this->boolean('stream_mode_only');
113+
$osp->conversation_tree = !$this->boolean('conversation_tree');
114114
$osp->stream_nicknames = $this->boolean('stream_nicknames');
115115
$osp->modified = common_sql_now();
116116

@@ -158,12 +158,12 @@ function formData()
158158
$this->elementStart('fieldset');
159159
$this->elementStart('ul', 'form_data');
160160
$this->elementStart('li');
161-
$this->checkbox('stream_mode_only', _('Only stream mode (no conversations) in timelines'),
162-
$this->user->streamModeOnly());
161+
$this->checkbox('stream_mode_only', _('Show conversations in timelines'),
162+
!$this->user->streamModeOnly());
163163
$this->elementEnd('li');
164164
$this->elementStart('li');
165-
$this->checkbox('conversation_tree', _('Show conversation page as hierarchical trees'),
166-
$this->user->conversationTree());
165+
$this->checkbox('conversation_tree', _('Show conversation page as flat listing'),
166+
!$this->user->conversationTree());
167167
$this->elementEnd('li');
168168
$this->elementStart('li');
169169
$this->checkbox('stream_nicknames', _('Show nicknames (not full names) in timelines'),

classes/User.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,7 +1190,7 @@ function streamModeOnly()
11901190
}
11911191
}
11921192

1193-
return false;
1193+
return true;
11941194
}
11951195

11961196
function conversationTree()
@@ -1202,7 +1202,7 @@ function conversationTree()
12021202
}
12031203
}
12041204

1205-
return false;
1205+
return true;
12061206
}
12071207

12081208
function streamNicknames()

0 commit comments

Comments
 (0)