From e0aea5c003634b19c4a76efae425d124f477de50 Mon Sep 17 00:00:00 2001
From: nanosimbiot <nanosimbiot@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Tue, 26 Jul 2011 09:35:13 +0000
Subject: [PATCH] r155
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

недочёты git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@155 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/includes/ucp/usercp_register.php     | 3 +--
 upload/templates/default/posting_editor.tpl | 9 ++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/upload/includes/ucp/usercp_register.php b/upload/includes/ucp/usercp_register.php
index f61fcd7f7..e7306c900 100644
--- a/upload/includes/ucp/usercp_register.php
+++ b/upload/includes/ucp/usercp_register.php
@@ -118,7 +118,6 @@ switch ($mode)
 			'user_sig'         => true,
 			'user_occ'         => true,
 			'user_interests'   => true,
-			'user_avatar'      => true,
 			'user_avatar_type' => true,
 		);
 
@@ -137,6 +136,7 @@ switch ($mode)
 			SELECT
 				user_id,
 				user_level,
+				user_avatar,
 				$profile_fields_sql
 			FROM ". BB_USERS ."
 			WHERE user_id = $pr_user_id
@@ -534,7 +534,6 @@ foreach ($profile_fields as $field => $can_edit)
 		$tp_data['USER_SKYPE'] = $pr_data['user_skype'];
 		break;
 
-	case 'user_avatar':
 	case 'user_avatar_type':
 		if(isset($_POST['avatargallery']) && !$errors)
 		{
diff --git a/upload/templates/default/posting_editor.tpl b/upload/templates/default/posting_editor.tpl
index 4c8ec9541..3a24bda52 100644
--- a/upload/templates/default/posting_editor.tpl
+++ b/upload/templates/default/posting_editor.tpl
@@ -11,7 +11,7 @@ ajax.callback.posts = function(data){
 </script>
 <div class="mrg_4" style="padding-left:2px;">
 <select name="fontFace">
-	<option style="font-family: Verdana" value="-1" selected="selected">{L_QR_FONT_SEL}:</option>
+	<option style="font-family: Verdana" value="-1" selected="selected">{L_FONT_SEL}:</option>
 	<option style="font-family: Courier" value="Courier">&nbsp;Courier</option>
 	<option style="font-family: 'Courier New'" value="'Courier New'">&nbsp;Courier New</option>
 	<option style="font-family: monospace" value="monospace">&nbsp;monospace</option>
@@ -28,7 +28,7 @@ ajax.callback.posts = function(data){
 </select>
 &nbsp;
 <select name="codeColor" class="text_color">
-	<option style="color: black; background: #fff;" value="black" selected="selected">{L_QR_COLOR_SEL}:</option>
+	<option style="color: black; background: #fff;" value="black" selected="selected">{L_FONT_COLOR_SEL}:</option>
 	<option style="color: darkred;" value="darkred">&nbsp;{L_COLOR_DARK_RED}</option>
 	<option style="color: brown;" value="brown">&nbsp;{L_COLOR_BROWN}</option>
 	<option style="color: #996600;" value="#996600">&nbsp;{L_COLOR_ORANGE}</option>
@@ -41,11 +41,11 @@ ajax.callback.posts = function(data){
 	<option style="color: blue;" value="blue">&nbsp;{L_COLOR_BLUE}</option>
 	<option style="color: darkblue;" value="darkblue">&nbsp;{L_COLOR_DARK_BLUE}</option>
 	<option style="color: indigo;" value="indigo">&nbsp;{L_COLOR_INDIGO}</option>
-	<option style="color: #006699;" value="#006699">&nbsp;{L_COLOR_STEEL_BLUE}</option>
+	<option style="color: #006699;" value="#006699">&nbsp;{L_STEEL_BLUE}</option>
 </select>
 &nbsp;
 <select name="codeSize" class="text_size">
-	<option value="12" selected="selected">{L_QR_SIZE_SEL}:</option>
+	<option value="12" selected="selected">{L_FONT_SIZE_SEL}:</option>
 	<option value="9" class="em">{L_FONT_SMALL}</option>
 	<option value="10">&nbsp;size=10</option>
 	<option value="11">&nbsp;size=11</option>
@@ -174,7 +174,6 @@ function checkForm(form) {
 				topic_id: {TOPIC_ID}
 			});
 		}, 100);
-		$('#topic_quick_reply').hide();
 		return false;
 	}
 	<!-- ENDIF -->