From 06387c34491f76e639cf73d11e2d2d80383da922 Mon Sep 17 00:00:00 2001
From: darkmod007 <darkmod007@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Fri, 9 Nov 2012 15:32:22 +0000
Subject: [PATCH] r471
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Мелкие фиксы найдены пользователями git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@471 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/config.php                               | 4 ++--
 upload/groupcp.php                              | 4 ++--
 upload/includes/ucp/usercp_viewprofile.php      | 2 +-
 upload/memberlist.php                           | 6 +-----
 upload/templates/admin/admin_board.tpl          | 4 ++--
 upload/templates/default/memberlist.tpl         | 2 +-
 upload/templates/default/usercp_viewprofile.tpl | 2 +-
 7 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/upload/config.php b/upload/config.php
index dff30055c..6eb43d62e 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -57,8 +57,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.5 Beta';
 
-$bb_cfg['tp_release_date'] = '07-11-2012';
-$bb_cfg['tp_release_state'] = 'R470';
+$bb_cfg['tp_release_date'] = '09-11-2012';
+$bb_cfg['tp_release_state'] = 'R471';
 
 // Database
 $charset  = 'utf8';
diff --git a/upload/groupcp.php b/upload/groupcp.php
index 29d0ea59b..6414c3c40 100644
--- a/upload/groupcp.php
+++ b/upload/groupcp.php
@@ -17,7 +17,7 @@ function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$
 
 	$from   = ( !empty($row['user_from']) ) ? $row['user_from'] : '';
 	$joined = bb_date($row['user_regdate']);
-	$user_time   = ( !empty($row['user_time']) ) ? bb_date($row['user_time']) : $lang['NO'];
+	$user_time   = ( !empty($row['user_time']) ) ? bb_date($row['user_time']) : $lang['NONE'];
 	$posts  = ( $row['user_posts'] ) ? $row['user_posts'] : 0;
 	$pm     = ($bb_cfg['text_buttons']) ? '<a class="txtb" href="'. ("privmsg.php?mode=post&amp;". POST_USERS_URL ."=".$row['user_id']) .'">'. $lang['SEND_PM_TXTB'] .'</a>' : '<a href="' . ("privmsg.php?mode=post&amp;". POST_USERS_URL ."=".$row['user_id']) .'"><img src="' . $images['icon_pm'] . '" alt="' . $lang['SEND_PRIVATE_MESSAGE'] . '" title="' . $lang['SEND_PRIVATE_MESSAGE'] . '" border="0" /></a>';
 
@@ -556,7 +556,7 @@ else
 		'MOD_PM' => $pm,
 		'MOD_EMAIL' => $email,
 		'MOD_WWW' => $www,
-		'MOD_TIME' => ( !empty($group_info['group_time']) ) ? bb_date($group_info['group_time']) : $lang['NO'],
+		'MOD_TIME' => ( !empty($group_info['group_time']) ) ? bb_date($group_info['group_time']) : $lang['NONE'],
 		'U_SEARCH_USER' => "search.php?mode=searchuser",
         'GROUP_TYPE' => $group_type,
 		'S_GROUP_OPEN_TYPE' => GROUP_OPEN,
diff --git a/upload/includes/ucp/usercp_viewprofile.php b/upload/includes/ucp/usercp_viewprofile.php
index 623c046ee..2e09be64c 100644
--- a/upload/includes/ucp/usercp_viewprofile.php
+++ b/upload/includes/ucp/usercp_viewprofile.php
@@ -37,7 +37,7 @@ if ($user_rank = $profiledata['user_rank'] AND isset($ranks[$user_rank]))
 }
 if (IS_ADMIN)
 {
-	$rank_select = array($lang['NO'] => 0);
+	$rank_select = array($lang['NONE'] => 0);
 	foreach ($ranks as $row)
 	{
 		$rank_select[$row['rank_title']] = $row['rank_id'];
diff --git a/upload/memberlist.php b/upload/memberlist.php
index efd077cb6..7571e22a0 100644
--- a/upload/memberlist.php
+++ b/upload/memberlist.php
@@ -3,7 +3,7 @@
 define('IN_PHPBB', true);
 define('BB_SCRIPT', 'memberlist');
 define('BB_ROOT', './');
-require(BB_ROOT ."common.php");
+require(BB_ROOT .'common.php');
 
 $page_cfg['use_tablesorter'] = true;
 
@@ -234,8 +234,4 @@ if ( $mode != 'topten' || $bb_cfg['topics_per_page'] < 10 )
 	DB()->sql_freeresult($result);
 }
 
-$template->assign_vars(array(
-	'PAGE_TITLE' => $lang['MEMBERLIST'],
-));
-
 print_page('memberlist.tpl');
diff --git a/upload/templates/admin/admin_board.tpl b/upload/templates/admin/admin_board.tpl
index 76150514f..8621de291 100644
--- a/upload/templates/admin/admin_board.tpl
+++ b/upload/templates/admin/admin_board.tpl
@@ -165,8 +165,8 @@
 <tr>
 	<td><h4>{L_ALLOW_SIG}</h4></td>
 	<td>
-	    <label><input type="radio" name="allow_sig" value="1" <!-- IF ALLOW_SMILIES -->checked="checked"<!-- ENDIF --> />{L_YES}</label>&nbsp;&nbsp;
-		<label><input type="radio" name="allow_sig" value="0" <!-- IF not ALLOW_SMILIES -->checked="checked"<!-- ENDIF --> />{L_NO}</label>
+	    <label><input type="radio" name="allow_sig" value="1" <!-- IF ALLOW_SIG -->checked="checked"<!-- ENDIF --> />{L_YES}</label>&nbsp;&nbsp;
+		<label><input type="radio" name="allow_sig" value="0" <!-- IF not ALLOW_SIG -->checked="checked"<!-- ENDIF --> />{L_NO}</label>
 	</td>
 </tr>
 <tr>
diff --git a/upload/templates/default/memberlist.tpl b/upload/templates/default/memberlist.tpl
index 8797e3e8d..645215e98 100644
--- a/upload/templates/default/memberlist.tpl
+++ b/upload/templates/default/memberlist.tpl
@@ -1,4 +1,4 @@
-<h1 class="pagetitle">{PAGE_TITLE}</h1>
+<h1 class="pagetitle">{L_MEMBERLIST}</h1>
 
 <form method="post" action="{S_MODE_ACTION}" name="post">
 <table width="100%">
diff --git a/upload/templates/default/usercp_viewprofile.tpl b/upload/templates/default/usercp_viewprofile.tpl
index dac52ae1a..be73b592a 100644
--- a/upload/templates/default/usercp_viewprofile.tpl
+++ b/upload/templates/default/usercp_viewprofile.tpl
@@ -366,7 +366,7 @@ ajax.callback.gen_passkey = function(data){
 			<!-- IF WWW -->
 			<tr>
 				<th>{L_WEBSITE}:</th>
-				<td id="user_website"><a href="{WWW}" class="editable">{WWW}</a></td>
+				<td id="user_website"><a href="{WWW}" class="editable" target="_blank">{WWW}</a></td>
 			</tr>
 			<!-- ENDIF -->
 			<!-- IF OCCUPATION -->