aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-09-18 16:32:05 -0700
committerfriendica <info@friendica.com>2014-09-18 16:32:05 -0700
commitd4759a5883e6776a2022b204b1af84e454de7f67 (patch)
tree48233090c33d9741f7173f6fd727de53b2d58200
parent0b47fb9a91b58147e616ea75a23dea0d431c40f8 (diff)
downloadvolse-hubzilla-d4759a5883e6776a2022b204b1af84e454de7f67.tar.gz
volse-hubzilla-d4759a5883e6776a2022b204b1af84e454de7f67.tar.bz2
volse-hubzilla-d4759a5883e6776a2022b204b1af84e454de7f67.zip
repeated content collapse on update from display page under rare conditions (when the conversation hasn't changed)
-rw-r--r--mod/display.php2
-rw-r--r--mod/settings.php6
-rw-r--r--version.inc2
-rwxr-xr-xview/tpl/settings.tpl1
4 files changed, 9 insertions, 2 deletions
diff --git a/mod/display.php b/mod/display.php
index c389eb976..be06c1e82 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -85,6 +85,8 @@ function display_content(&$a, $update = 0, $load = false) {
$target_item = $r[0];
}
+ $r = null;
+
if($target_item['item_restrict'] & ITEM_WEBPAGE) {
$x = q("select * from channel where channel_id = %d limit 1",
intval($target_item['uid'])
diff --git a/mod/settings.php b/mod/settings.php
index f9568feb3..81596a27e 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -935,6 +935,10 @@ function settings_content(&$a) {
}
}
+
+ $permissions_role = get_pconfig(local_user(),'system','permissions_role');
+ $permissions_set = (($permissions_role && $permissions_role != 'custom') ? true : false);
+
$o .= replace_macros($stpl,array(
'$ptitle' => t('Channel Settings'),
@@ -955,6 +959,8 @@ function settings_content(&$a) {
'$adult' => array('adult', t('Adult Content'), $adult_flag, t('This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)')),
'$h_prv' => t('Security and Privacy Settings'),
+ '$permissions_set' => $permissions_set,
+ '$perms_set_msg' => t('Your permissions are already configured. Click to view/adjust'),
'$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents displaying in your profile that you are online')),
diff --git a/version.inc b/version.inc
index 1213afd33..d75eabb40 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-09-17.801
+2014-09-18.802
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 443e63696..4dba1f23e 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -24,7 +24,6 @@
{{include file="field_checkbox.tpl" field=$hide_presence}}
-
<h3 id="settings-privacy-macros">{{$lbl_pmacro}}</h3>
<ul id="settings-privacy-macros">
<li><a href="#" onclick="channel_privacy_macro(2); return false" id="settings_pmacro2">{{$pmacro2}}</a></li>