Make old timeline style the default

RedEnchilada · Feb 9, 2015 · 59f3111 · 59f3111
1 parent 7f9e35a
commit 59f3111
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/actions/oldschoolsettings.php b/actions/oldschoolsettings.php
@@ -109,8 +109,8 @@ function handlePost()
             $osp->created = common_sql_now();
         }
 
-        $osp->stream_mode_only  = $this->boolean('stream_mode_only');
-        $osp->conversation_tree = $this->boolean('conversation_tree');
+        $osp->stream_mode_only  = !$this->boolean('stream_mode_only');
+        $osp->conversation_tree = !$this->boolean('conversation_tree');
         $osp->stream_nicknames  = $this->boolean('stream_nicknames');
         $osp->modified          = common_sql_now();
 
@@ -158,12 +158,12 @@ function formData()
         $this->elementStart('fieldset');
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
-        $this->checkbox('stream_mode_only', _('Only stream mode (no conversations) in timelines'),
-                        $this->user->streamModeOnly());
+        $this->checkbox('stream_mode_only', _('Show conversations in timelines'),
+                        !$this->user->streamModeOnly());
         $this->elementEnd('li');
         $this->elementStart('li');
-        $this->checkbox('conversation_tree', _('Show conversation page as hierarchical trees'),
-                        $this->user->conversationTree());
+        $this->checkbox('conversation_tree', _('Show conversation page as flat listing'),
+                        !$this->user->conversationTree());
         $this->elementEnd('li');
         $this->elementStart('li');
         $this->checkbox('stream_nicknames', _('Show nicknames (not full names) in timelines'),

diff --git a/classes/User.php b/classes/User.php
@@ -1190,7 +1190,7 @@ function streamModeOnly()
             } 
         }
 
-        return false;
+        return true;
     }
 
     function conversationTree()
@@ -1202,7 +1202,7 @@ function conversationTree()
             }
         }
 
-        return false;
+        return true;
     }
 
     function streamNicknames()