Prepopulate newnotice from URL arg

[quix0rs-gnu-social.git] / actions / oldschoolsettings.php

diff --git a/actions/oldschoolsettings.php b/actions/oldschoolsettings.php
index 74c6c05cda365b95c6d028bc797335691aab19b0..25ec13e4816426b3f95fb91c6a1634a1b4591308 100644 (file)
--- a/actions/oldschoolsettings.php
+++ b/actions/oldschoolsettings.php
@@ -98,7 +98,7 @@ class OldschoolsettingsAction extends SettingsAction
     {
         $user = common_current_user();
 
-        $osp = Old_school_prefs::staticGet('user_id', $user->id);
+        $osp = Old_school_prefs::getKV('user_id', $user->id);
         $orig = null;
 
         if (!empty($osp)) {
@@ -110,7 +110,6 @@ class OldschoolsettingsAction extends SettingsAction
         }
 
         $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();
 
@@ -162,10 +161,6 @@ class OldSchoolForm extends Form
                         $this->user->streamModeOnly());
         $this->elementEnd('li');
         $this->elementStart('li');
-        $this->checkbox('conversation_tree', _('Show conversation page as hierarchical trees'),
-                        $this->user->conversationTree());
-        $this->elementEnd('li');
-        $this->elementStart('li');
         $this->checkbox('stream_nicknames', _('Show nicknames (not full names) in timelines'),
                         $this->user->streamNicknames());
         $this->elementEnd('li');