From 2cf6ca2116807cdefb78916c72ab9f3e4fff32bc Mon Sep 17 00:00:00 2001
From: nanosimbiot <nanosimbiot@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Tue, 9 Aug 2011 19:06:22 +0000
Subject: [PATCH] r202
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

мелкие фиксы найденные Fate git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@202 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/config.php                           |  4 ++--
 upload/memberlist.php                       |  4 ++--
 upload/templates/default/posting_editor.tpl | 11 +++++++----
 upload/templates/default/privmsgs_read.tpl  |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/upload/config.php b/upload/config.php
index 7b1d73876..284999410 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -57,8 +57,8 @@ $bb_cfg['css_ver'] = 1;
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.0 Stable';
-$bb_cfg['tp_release_state'] = 'R201';
-$bb_cfg['tp_release_date'] = '9-08-2011';
+$bb_cfg['tp_release_state'] = 'R202';
+$bb_cfg['tp_release_date'] = '10-08-2011';
 
 $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger
 $bb_cfg['srv_overloaded_msg'] = "Извините, в данный момент сервер перегружен\nПопробуйте повторить запрос через несколько минут";
diff --git a/upload/memberlist.php b/upload/memberlist.php
index 56456401b..b23d27b7e 100644
--- a/upload/memberlist.php
+++ b/upload/memberlist.php
@@ -180,10 +180,10 @@ if ( $row = DB()->sql_fetchrow($result) )
         $poster_avatar = get_avatar($row['user_avatar'], $row['user_avatar_type'], !bf($row['user_opt'], 'user_opt', 'allow_avatar'));
 
 		$pm = ($bb_cfg['text_buttons']) ? '<a class="txtb" href="'. append_sid("privmsg.php?mode=post&amp;". POST_USERS_URL ."=$user_id") .'">'. $lang['SEND_PM_TXTB'] .'</a>' : '<a href="' . append_sid("privmsg.php?mode=post&amp;". POST_USERS_URL ."=$user_id") .'"><img src="' . $images['icon_pm'] . '" alt="' . $lang['SEND_PRIVATE_MESSAGE'] . '" title="' . $lang['SEND_PRIVATE_MESSAGE'] . '" border="0" /></a>';
-		
+
         if (bf($row['user_opt'], 'user_opt', 'viewemail') || IS_ADMIN)
         {
-        	$email_uri = ($bb_cfg['board_email_form']) ? append_sid('profile.php?mode=email&amp;'. POST_USERS_URL .'='. $profiledata['user_id']) : 'mailto:'. $row['user_email'];
+        	$email_uri = ($bb_cfg['board_email_form']) ? append_sid("profile.php?mode=email&amp;". POST_USERS_URL ."=$user_id") : 'mailto:'. $row['user_email'];
         	$email = '<a class="editable" href="'. $email_uri .'">'. $row['user_email'] .'</a>';
         }
         else
diff --git a/upload/templates/default/posting_editor.tpl b/upload/templates/default/posting_editor.tpl
index 6a9542a8f..163a14c3c 100644
--- a/upload/templates/default/posting_editor.tpl
+++ b/upload/templates/default/posting_editor.tpl
@@ -188,8 +188,10 @@ function checkForm(form) {
 		setTimeout(function() { alert(formErrors) }, 100);
 		return false;
 	}
-	<!-- IF QUICK_REPLY -->
-	<!-- IF $bb_cfg['use_ajax_posts'] && !IS_GUEST -->
+<!-- IF QUICK_REPLY -->
+<!-- IF IN_PM -->
+<!-- ELSE -->
+<!-- IF $bb_cfg['use_ajax_posts'] && !IS_GUEST -->
 	if(form.message.value.length < 100 && submitted)
 	{
 		setTimeout(function() {
@@ -202,8 +204,9 @@ function checkForm(form) {
 		}, 100);
 		return false;
 	}
-	<!-- ENDIF -->
-	<!-- ENDIF -->
+<!-- ENDIF -->
+<!-- ENDIF -->
+<!-- ENDIF -->
 	return true;
 }
 </script>
diff --git a/upload/templates/default/privmsgs_read.tpl b/upload/templates/default/privmsgs_read.tpl
index a4dd014f2..870b47a54 100644
--- a/upload/templates/default/privmsgs_read.tpl
+++ b/upload/templates/default/privmsgs_read.tpl
@@ -13,7 +13,7 @@
 
 <div class="spacer_6"></div>
 
-<form method="post" action="{S_PRIVMSGS_ACTION}">
+<form action="{S_PRIVMSGS_ACTION}" method="post" name="post" onsubmit="if(checkForm(this)){ dis_submit_btn(); }else{ return false; }">
 {S_HIDDEN_FIELDS}
 
 <table class="borderless">