From e1d119607b083f8bc69d0c2c3c7f34823d776314 Mon Sep 17 00:00:00 2001
From: nanosimbiot <nanosimbiot@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Mon, 2 Apr 2012 13:56:46 +0000
Subject: [PATCH] r389

bugs fix git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@389 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/config.php                              | 4 ++--
 upload/includes/report_hack/report_post.php    | 2 +-
 upload/includes/report_hack/report_privmsg.php | 2 +-
 upload/includes/report_hack/report_topic.php   | 2 +-
 upload/includes/report_hack/report_user.php    | 2 +-
 upload/includes/ucp/usercp_register.php        | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/upload/config.php b/upload/config.php
index 05a4caa2e..14a250fcc 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -52,8 +52,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.4 (beta)';
-$bb_cfg['tp_release_state'] = 'R388';
-$bb_cfg['tp_release_date'] = '19-03-2012';
+$bb_cfg['tp_release_state'] = 'R389';
+$bb_cfg['tp_release_date'] = '2-04-2012';
 
 // Database
 $charset  = 'utf8';
diff --git a/upload/includes/report_hack/report_post.php b/upload/includes/report_hack/report_post.php
index f513283c5..8d542942f 100644
--- a/upload/includes/report_hack/report_post.php
+++ b/upload/includes/report_hack/report_post.php
@@ -164,7 +164,7 @@ class report_post extends report_module
 	function subject_url($report_subject, $non_html_amp = false)
 	{
 		$report_subject = (int) $report_subject;
-		return 'viewtopic.php?'. POST_POST_URL .'='. $report_subject .'#'. $report_subject . $non_html_amp;
+		return 'viewtopic.php?'. POST_POST_URL .'='. $report_subject .'#'. $report_subject;
 	}
 
 	//
diff --git a/upload/includes/report_hack/report_privmsg.php b/upload/includes/report_hack/report_privmsg.php
index c7afd0754..763a0da6e 100644
--- a/upload/includes/report_hack/report_privmsg.php
+++ b/upload/includes/report_hack/report_privmsg.php
@@ -163,7 +163,7 @@ class report_privmsg extends report_module
 	function subject_url($report_subject, $non_html_amp = false)
 	{
 		$sep = ($non_html_amp) ? '&' : '&amp;';
-		return 'privmsg.php?mode=read'.$sep . POST_POST_URL . '=' . (int) $report_subject . $non_html_amp;
+		return 'privmsg.php?mode=read'.$sep . POST_POST_URL . '=' . (int) $report_subject;
 	}
 
 	//
diff --git a/upload/includes/report_hack/report_topic.php b/upload/includes/report_hack/report_topic.php
index 3e003307d..970654c34 100644
--- a/upload/includes/report_hack/report_topic.php
+++ b/upload/includes/report_hack/report_topic.php
@@ -163,7 +163,7 @@ class report_topic extends report_module
 	//
 	function subject_url($report_subject, $non_html_amp = false)
 	{
-		return 'viewtopic.php?'. POST_TOPIC_URL .'='. (int) $report_subject . $non_html_amp;
+		return 'viewtopic.php?'. POST_TOPIC_URL .'='. (int) $report_subject;
 	}
 
 	//
diff --git a/upload/includes/report_hack/report_user.php b/upload/includes/report_hack/report_user.php
index 452c89c3a..fa16d9cc4 100644
--- a/upload/includes/report_hack/report_user.php
+++ b/upload/includes/report_hack/report_user.php
@@ -21,7 +21,7 @@ class report_user extends report_module
 	function subject_url($id, $non_html_amp = false)
 	{
 		$sep = ($non_html_amp) ? '&' : '&amp;';
-		return 'profile.php?mode=viewprofile'. $sep. POST_USERS_URL .'=' . (int) $id . $non_html_amp;
+		return 'profile.php?mode=viewprofile'. $sep. POST_USERS_URL .'=' . (int) $id;
 	}
 
 	//
diff --git a/upload/includes/ucp/usercp_register.php b/upload/includes/ucp/usercp_register.php
index 35068830b..767478c89 100644
--- a/upload/includes/ucp/usercp_register.php
+++ b/upload/includes/ucp/usercp_register.php
@@ -548,7 +548,7 @@ foreach ($profile_fields as $field => $can_edit)
 	case 'user_avatar_type':
 		if(isset($_POST['avatargallery']) && !$errors)
 		{
-			$avatar_category = (!empty($_POST['avatarcategory'])) ? htmlspecialchars($_POST['avatarcategory']) : '';
+			$category = (!empty($_POST['avatarcategory'])) ? htmlspecialchars($_POST['avatarcategory']) : '';
 
 	        $dir = @opendir($bb_cfg['avatar_gallery_path']);
 
@@ -630,7 +630,7 @@ foreach ($profile_fields as $field => $can_edit)
 				'S_HIDDEN_FIELDS' => $s_hidden_vars)
 			);
 
-			$template->set_filenames(array('body' => 'usercp_avatar_gallery.tpl'));
+			print_page('usercp_avatar_gallery.tpl');
 		}
 
 		$user_avatar_local = (isset($_POST['avatarselect']) && !empty($_POST['submitavatar']) && $bb_cfg['allow_avatar_local']) ? htmlspecialchars($_POST['avatarselect']) : ((isset($_POST['avatarlocal'])) ? htmlspecialchars($_POST['avatarlocal']) : '');