repeated content collapse on update from display page under rare conditions (when the conversation hasn't changed)

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'])

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')),
 

version.inc

@@ -1 +1 @@
-2014-09-17.801
+2014-09-18.802

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>