aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-11-02 18:40:50 -0700
committerzotlabs <mike@macgirvin.com>2016-11-02 18:40:50 -0700
commit9e2ccbd2a7cda195de5ae03ea8729561762d157a (patch)
treecf18d5edc88381ca93cc3d13b08685e030ec526f /include
parent6a6494d9475b0c9b87408f648c8988d7444b3793 (diff)
downloadvolse-hubzilla-9e2ccbd2a7cda195de5ae03ea8729561762d157a.tar.gz
volse-hubzilla-9e2ccbd2a7cda195de5ae03ea8729561762d157a.tar.bz2
volse-hubzilla-9e2ccbd2a7cda195de5ae03ea8729561762d157a.zip
convert manual page updates to a display setting instead of a feature
Diffstat (limited to 'include')
-rw-r--r--include/channel.php11
-rw-r--r--include/features.php9
2 files changed, 11 insertions, 9 deletions
diff --git a/include/channel.php b/include/channel.php
index 39ffef2d2..6d180da01 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1930,4 +1930,15 @@ function channel_reddress($channel) {
return '';
return strtolower($channel['channel_address'] . '@' . App::get_hostname());
+}
+
+
+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');
+
+ return intval($x);
+
} \ No newline at end of file
diff --git a/include/features.php b/include/features.php
index 83a9c9178..1ccdbf015 100644
--- a/include/features.php
+++ b/include/features.php
@@ -157,15 +157,6 @@ function get_features($filtered = true) {
feature_level('smart_birthdays',2),
],
- [
- 'static_updates',
- t('Manual Page Updates'),
- t('Off = automatically update changing conversations. On = Wait until the page is re-loaded.'),
- false,
- get_config('feature_lock','static_updates'),
- feature_level('static_updates',1),
- ],
-
[
'advanced_dirsearch',
t('Advanced Directory Search'),