Merge pull request #405 from beardy-unixer/master

A few little fixes

2 files changed, 18 insertions, 17 deletions

diff --git a/include/identity.php b/include/identity.php
index e773bb314..ad787c22c 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -976,7 +976,7 @@ function advanced_profile(&$a) {
 		if($a->profile['marital']) $profile['marital'] = array( t('Status:'), $a->profile['marital']);
 
 
-		if($a->profile['with']) $profile['marital']['with'] = $a->profile['with'];
+		if($a->profile['with']) $profile['marital']['with'] = bbcode($a->profile['with']);
 
 		if(strlen($a->profile['howlong']) && $a->profile['howlong'] !== '0000-00-00 00:00:00') {
 				$profile['howlong'] = relative_date($a->profile['howlong'], t('for %1$d %2$s'));
@@ -994,32 +994,32 @@ function advanced_profile(&$a) {
 
 		if($a->profile['religion']) $profile['religion'] = array( t('Religion:'), $a->profile['religion']);
 
-		if($txt = prepare_text($a->profile['about'])) $profile['about'] = array( t('About:'), $txt );
+		if($txt = bbcode($a->profile['about'])) $profile['about'] = array( t('About:'), $txt );
 
-		if($txt = prepare_text($a->profile['interest'])) $profile['interest'] = array( t('Hobbies/Interests:'), $txt);
+		if($txt = bbcode($a->profile['interest'])) $profile['interest'] = array( t('Hobbies/Interests:'), $txt);
 
-		if($txt = prepare_text($a->profile['likes'])) $profile['likes'] = array( t('Likes:'), $txt);
+		if($txt = bbcode($a->profile['likes'])) $profile['likes'] = array( t('Likes:'), $txt);
 
-		if($txt = prepare_text($a->profile['dislikes'])) $profile['dislikes'] = array( t('Dislikes:'), $txt);
+		if($txt = bbcode($a->profile['dislikes'])) $profile['dislikes'] = array( t('Dislikes:'), $txt);
 
 
-		if($txt = prepare_text($a->profile['contact'])) $profile['contact'] = array( t('Contact information and Social Networks:'), $txt);
+		if($txt = bbcode($a->profile['contact'])) $profile['contact'] = array( t('Contact information and Social Networks:'), $txt);
 
-		if($txt = prepare_text($a->profile['channels'])) $profile['channels'] = array( t('My other channels:'), $txt);
+		if($txt = bbcode($a->profile['channels'])) $profile['channels'] = array( t('My other channels:'), $txt);
 
-		if($txt = prepare_text($a->profile['music'])) $profile['music'] = array( t('Musical interests:'), $txt);
+		if($txt = bbcode($a->profile['music'])) $profile['music'] = array( t('Musical interests:'), $txt);
 		
-		if($txt = prepare_text($a->profile['book'])) $profile['book'] = array( t('Books, literature:'), $txt);
+		if($txt = bbcode($a->profile['book'])) $profile['book'] = array( t('Books, literature:'), $txt);
 
-		if($txt = prepare_text($a->profile['tv'])) $profile['tv'] = array( t('Television:'), $txt);
+		if($txt = bbcode($a->profile['tv'])) $profile['tv'] = array( t('Television:'), $txt);
 
-		if($txt = prepare_text($a->profile['film'])) $profile['film'] = array( t('Film/dance/culture/entertainment:'), $txt);
+		if($txt = bbcode($a->profile['film'])) $profile['film'] = array( t('Film/dance/culture/entertainment:'), $txt);
 
-		if($txt = prepare_text($a->profile['romance'])) $profile['romance'] = array( t('Love/Romance:'), $txt);
+		if($txt = bbcode($a->profile['romance'])) $profile['romance'] = array( t('Love/Romance:'), $txt);
 		
-		if($txt = prepare_text($a->profile['work'])) $profile['work'] = array( t('Work/employment:'), $txt);
+		if($txt = bbcode($a->profile['work'])) $profile['work'] = array( t('Work/employment:'), $txt);
 
-		if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt );
+		if($txt = bbcode($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt );
 
 
 		$things = get_things($a->profile['profile_guid'],$a->profile['profile_uid']);
@@ -1277,4 +1277,4 @@ function identity_selector() {
 	}
 
 	return '';
-}
\ No newline at end of file
+}
diff --git a/include/security.php b/include/security.php
index 282c8ab73..0edbf854d 100644
--- a/include/security.php
+++ b/include/security.php
@@ -53,8 +53,9 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 	/* This account has never created a channel. Send them to new_channel by default */
 
 	if($a->module === 'login') {
-		$r = q("select count(channel_id) as total from channel where channel_account_id = %d",
-			intval($a->account['account_id'])
+		$r = q("select count(channel_id) as total from channel where channel_account_id = %d and not ( channel_pageflags & %d)",
+			intval($a->account['account_id']),
+			intval(PAGE_REMOVED)
 		);
 		if(($r) && (! $r[0]['total']))
 			goaway(z_root() . '/new_channel');