Merge pull request #581 from fermionic/20130112-backport-red-smarty-improvements

fixes and tweaks to Smarty processing

mod/display.php

@@ -4,8 +4,6 @@
 function display_init(&$a) {
 
 	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
-		notice( t('Public access denied.') . EOL);
-		killme();
 		return;
 	}
 
@@ -17,6 +15,11 @@ function display_init(&$a) {
 
 function display_content(&$a, $update = 0) {
 
+	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+		notice( t('Public access denied.') . EOL);
+		return;
+	}
+
 	require_once("include/bbcode.php");
 	require_once('include/security.php');
 	require_once('include/conversation.php');

mod/group.php

@@ -220,16 +220,15 @@ function group_content(&$a) {
 		}
 	}
 
+	$context['$groupeditor'] = $groupeditor;
 	$context['$desc'] = t('Click on a contact to add or remove.');
 
 	if($change) {
-		$context['$groupeditor'] = $groupeditor;
 		$tpl = get_markup_template('groupeditor.tpl');
 		echo replace_macros($tpl, $context);
 		killme();
 	}
 	
-	$context['$groupedit_info'] = $groupeditor;
 	return replace_macros($tpl, $context);
 
 }

mod/message.php

@@ -516,7 +516,7 @@ function message_content(&$a) {
 			'$to' => t('To:'),
 			'$showinputs' => '',
 			'$subject' => t('Subject:'),
-			'$subjtxt' => template_escape($message['title']),
+			'$subjtxt' => $subjtxt_e,
 			'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
 			'$yourmessage' => t('Your message:'),
 			'$text' => '',

mod/profiles.php

@@ -6,8 +6,6 @@ function profiles_init(&$a) {
 	nav_set_selected('profiles');
 
 	if(! local_user()) {
-		notice( t('Permission denied.') . EOL);
-		killme();
 		return;
 	}
 
@@ -565,6 +563,11 @@ function profile_activity($changed, $value) {
 
 function profiles_content(&$a) {
 
+	if(! local_user()) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+
 	$o = '';
 
 	if(($a->argc > 1) && (intval($a->argv[1]))) {