diff options
| -rw-r--r-- | Zotlabs/Module/Settings/Display.php | 2 | ||||
| -rw-r--r-- | include/channel.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Module/Settings/Display.php b/Zotlabs/Module/Settings/Display.php index 25d1d21a0..67cecf1f5 100644 --- a/Zotlabs/Module/Settings/Display.php +++ b/Zotlabs/Module/Settings/Display.php @@ -206,7 +206,7 @@ class Display { '$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')), '$itemspage' => array('itemspage', t("Maximum number of conversations to load at any time:"), $itemspage, t('Maximum of 100 items')), '$nosmile' => array('nosmile', t("Show emoticons (smilies) as images"), 1-intval($nosmile), '', $yes_no), - '$manual_update' => array('manual_update', t('Manual conversation updates'), channel_manual_conv_update(local_channel()), t('Default is automatic, which may increase screen jumping'), $yes_no), + '$manual_update' => array('manual_update', t('Manual conversation updates'), channel_manual_conv_update(local_channel()), t('Default is on, turning this off may increase screen jumping'), $yes_no), '$title_tosource' => array('title_tosource', t("Link post titles to source"), $title_tosource, '', $yes_no), '$layout_editor' => t('System Page Layout Editor - (advanced)'), '$theme_config' => $theme_config, diff --git a/include/channel.php b/include/channel.php index bc36a5707..8880c7f45 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1972,6 +1972,8 @@ function channel_manual_conv_update($channel_id) { $x = get_pconfig($channel_id, 'system','manual_conversation_update'); if($x === false) $x = get_config('system','manual_conversation_update'); + if($x === false) + $x = 1; return intval($x); @@ -1989,4 +1991,4 @@ function remote_login() { -}
\ No newline at end of file +} |