some 2.0.x fixes for some annoying bugs and some not so annoying ones.

git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@6981 89ea8834-ac86-4346-8a33-228a782c2dd0

8 files changed, 84 insertions, 88 deletions

diff --git a/phpBB/admin/admin_forums.php b/phpBB/admin/admin_forums.php
index 58d99750b9..bcaf989697 100644
--- a/phpBB/admin/admin_forums.php
+++ b/phpBB/admin/admin_forums.php
@@ -626,7 +626,7 @@ if( !empty($mode) )
 					$vote_ids = '';
 					do
 					{
-						$vote_ids = (($vote_ids != '') ? ', ' : '') . $row['vote_id'];
+						$vote_ids .= (($vote_ids != '') ? ', ' : '') . $row['vote_id'];
 					}
 					while ($row = $db->sql_fetchrow($result));
 
diff --git a/phpBB/admin/admin_users.php b/phpBB/admin/admin_users.php
index 247b362fe8..cdd950ec4d 100644
--- a/phpBB/admin/admin_users.php
+++ b/phpBB/admin/admin_users.php
@@ -109,30 +109,12 @@ if ( $mode == 'edit' || $mode == 'save' && ( isset($HTTP_POST_VARS['username'])
 				message_die(GENERAL_ERROR, 'Could not update votes for this user', '', __LINE__, __FILE__, $sql);
 			}
 			
-			$sql = "SELECT group_id
-				FROM " . GROUPS_TABLE . "
+			$sql = "UPDATE " . GROUPS_TABLE . "
+				SET group_moderator = " . $userdata['user_id'] . "
 				WHERE group_moderator = $user_id";
-			if( !($result = $db->sql_query($sql)) )
-			{
-				message_die(GENERAL_ERROR, 'Could not select groups where user was moderator', '', __LINE__, __FILE__, $sql);
-			}
-			
-			while ( $row_group = $db->sql_fetchrow($result) )
-			{
-				$group_moderator[] = $row_group['group_id'];
-			}
-			
-			if ( count($group_moderator) )
+			if( !$db->sql_query($sql) )
 			{
-				$update_moderator_id = implode(', ', $group_moderator);
-				
-				$sql = "UPDATE " . GROUPS_TABLE . "
-					SET group_moderator = " . $userdata['user_id'] . "
-					WHERE group_moderator IN ($update_moderator_id)";
-				if( !$db->sql_query($sql) )
-				{
-					message_die(GENERAL_ERROR, 'Could not update group moderators', '', __LINE__, __FILE__, $sql);
-				}
+				message_die(GENERAL_ERROR, 'Could not update group moderators', '', __LINE__, __FILE__, $sql);
 			}
 
 			$sql = "DELETE FROM " . USERS_TABLE . "
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index dd950f797b..428d8c6515 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -32,6 +32,7 @@ p,ul,td {font-size:10pt;}
 <ol>
 <li><a href="#changelog">Changelog</a></li>
 <ol type="i">
+	<li><a href="#2022">Changes since 2.0.22</a></li>
 	<li><a href="#2021">Changes since 2.0.21</a></li>
 	<li><a href="#2020">Changes since 2.0.20</a></li>
 	<li><a href="#2019">Changes since 2.0.19</a></li>
@@ -67,7 +68,20 @@ p,ul,td {font-size:10pt;}
 
 <p>This is a non-exhaustive (but still near complete) changelog for phpBB 2.0.x including beta and release candidate versions. Our thanks to all those people who've contributed bug reports and code fixes.</p>
 
-<a name="2021"></a><h3 class="h3">l.i. Changes since 2.0.21</h3>
+<a name="2022"></a><h3 class="h3">l.i. Changes since 2.0.22</h3>
+
+<ul>
+<li>[Fix] Correctly re-assign group moderator on user deletion (Bug #280)</li>
+<li>[Fix] Deleting a forum with multiple polls included (Bug #6740)</li>
+<li>[Fix] Fixed postgresql query for obtaining group moderator in groupcp.php (Bug #6550)</li>
+<li>[Fix] Selected field on first entry by default for font size within posting_body.tpl (Bug #7124)</li>
+<li>[Fix] Adjusted maxlength parameters in admin/styles_edit_body.tpl (Bug #81)</li>
+<li>[Fix] Fixed html output in make_forum_select if no forums present (Bug #436)</li>
+
+<li>[Fix] Fixed spelling error(s) in lang_admin.php (Bug #7172, #6978)</li>
+</ul>
+
+<a name="2021"></a><h3 class="h3">l.ii. Changes since 2.0.21</h3>
 
 <ul>
 <li>[Fix] Check for user's existence prior to showing email form</li>
@@ -83,7 +97,7 @@ p,ul,td {font-size:10pt;}
 <li>[Sec] Added session checks to various forms - kellanved</li>
 </ul>
 
-<a name="2020"></a><h3 class="h3">l.ii. Changes since 2.0.20</h3>
+<a name="2020"></a><h3 class="h3">l.iii. Changes since 2.0.20</h3>
 
 <ul>
 <li>[Fix] Changes to random number generator code to explicitly truncate the length of the string</li>
@@ -100,7 +114,7 @@ p,ul,td {font-size:10pt;}
 </ul>
 
 
-<a name="2019"></a><h3 class="h3">l.iii. Changes since 2.0.19</h3>
+<a name="2019"></a><h3 class="h3">l.iv. Changes since 2.0.19</h3>
 
 <ul>
 <li>[Fix] Prevent login attempts from incrementing for inactive users</li>
@@ -133,7 +147,7 @@ p,ul,td {font-size:10pt;}
 </ul>
 
 
-<a name="2018"></a><h3 class="h3">l.iv. Changes since 2.0.18</h3>
+<a name="2018"></a><h3 class="h3">l.v. Changes since 2.0.18</h3>
 
 <ul>
 <li>[Fix] corrected index on session keys table under MS SQL</li>
@@ -152,7 +166,7 @@ p,ul,td {font-size:10pt;}
 </ul>
 
 
-<a name="2017"></a><h3 class="h3">l.v. Changes since 2.0.17</h3>
+<a name="2017"></a><h3 class="h3">l.vi. Changes since 2.0.17</h3>
 
 <ul>
 <li>[Fix] incorrect handling of password resets if admin activation is enabled (Bug #88)</li>
@@ -200,7 +214,7 @@ p,ul,td {font-size:10pt;}
 <li>[Sec] compare imagetype on avatar uploading to match the file extension from uploaded file</li>
 </ul>
 
-<a name="2016"></a><h3 class="h3">l.vi. Changes since 2.0.16</h3>
+<a name="2016"></a><h3 class="h3">l.vii. Changes since 2.0.16</h3>
 
 <ul>
 <li>Added extra checks to the deletion code in privmsg.php - reported by party_fan</li>
@@ -216,7 +230,7 @@ p,ul,td {font-size:10pt;}
 <li>Correctly set username on posts when deleting a user from the admin panel</li>
 </ul>
 
-<a name="2015"></a><h3 class="h3">l.vii. Changes since 2.0.15</h3>
+<a name="2015"></a><h3 class="h3">l.viii. Changes since 2.0.15</h3>
 
 <ul>
 <li>Fixed critical issue with highlighting - <b>Discovered and fix provided by Ron van Daal</b></li>
@@ -228,7 +242,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed bug in admin re-authentication redirect for servers not having index.php as one of their default files set</li>
 </ul>
 
-<a name="2014"></a><h3 class="h3">l.viii. Changes since 2.0.14</h3>
+<a name="2014"></a><h3 class="h3">l.ix. Changes since 2.0.14</h3>
 
 <ul>
 <li>Fixed moderator status removal in groupcp.php</li>
@@ -250,7 +264,7 @@ p,ul,td {font-size:10pt;}
 <li>Empty url/img bbcodes no longer get parsed</li>
 </ul>
 
-<a name="2013"></a><h3 class="h3">l.ix. Changes since 2.0.13</h3>
+<a name="2013"></a><h3 class="h3">l.x. Changes since 2.0.13</h3>
 
 <ul>
 <li>Hardened author and keyword search a bit to not allow very server intensive searches</li>
@@ -267,7 +281,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed case-sensitivity issues in postgres7.php - <b>R45</b></li>
 </ul>
 
-<a name="2012"></a><h3 class="h3">l.x. Changes since 2.0.12</h3>
+<a name="2012"></a><h3 class="h3">l.xi. Changes since 2.0.12</h3>
 
 <ul>
 <li>Ommitted preg_replace warning in viewtopic due to improper working of preg_quote in PHP - originally reported by matrix_killer, fix submitted by another party</li>
@@ -275,7 +289,7 @@ p,ul,td {font-size:10pt;}
 <li>Minimum requirements raised to PHP 4.0.3 or above due to fixing vulnerability issues breaking PHP3 compatibility.</li>
 </ul>
 
-<a name="2011"></a><h3 class="h3">l.xi. Changes since 2.0.11</h3>
+<a name="2011"></a><h3 class="h3">l.xii. Changes since 2.0.11</h3>
 
 <ul>
 <li>Added confirm table to admin_db_utilities.php</li>
@@ -290,7 +304,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed path disclosure bug in viewtopic.php caused by a PHP 4.3.10 bug - <b>matrix_killer</b></li>
 </ul>
 
-<a name="2010"></a><h3 class="h3">l.xii. Changes since 2.0.10</h3>
+<a name="2010"></a><h3 class="h3">l.xiii. Changes since 2.0.10</h3>
 
 <ul>
 <li>Fixed vulnerability in highlighting code (<b>very high severity, please update your installation as soon as possible</b>)</li>
@@ -301,7 +315,7 @@ p,ul,td {font-size:10pt;}
 <li>Added visual confirmation mod to code base</li>
 </ul>
 
-<a name="209"></a><h3 class="h3">l.xiii. Changes since 2.0.9</h3>
+<a name="209"></a><h3 class="h3">l.xiv. Changes since 2.0.9</h3>
 
 <ul>
 <li>Fixed deleting of styles in admin_styles.php</li>
@@ -314,7 +328,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed visual confirmation code. The image was not created due to a wrong regular expression.</li>
 </ul>
 
-<a name="208"></a><h3 class="h3">l.xiv. Changes since 2.0.8</h3>
+<a name="208"></a><h3 class="h3">l.xv. Changes since 2.0.8</h3>
 
 <ul>
 <li>Fixed one vulnerability in admin_board.php - <b>Xore</b></li>
@@ -333,7 +347,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed problem with SID not delivered to next page in groupcp.php</li>
 </ul>
 
-<a name="207"></a><h3 class="h3">l.xv. Changes since 2.0.7</h3>
+<a name="207"></a><h3 class="h3">l.xvi. Changes since 2.0.7</h3>
 
 <ul>
 <li>Fixed several vulnerabilities in admin pages</li>
@@ -345,7 +359,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed sql injection vulnerability in privmsg - 2.0.8a</li>
 </ul>
 
-<a name="206"></a><h3 class="h3">1.xvi. Changes since 2.0.6</h3>
+<a name="206"></a><h3 class="h3">1.xvii. Changes since 2.0.6</h3>
 
 <ul>
 <li>Fixed several vulnerabilities in modcp - <b>Robert Lavierck</b></li>
@@ -359,7 +373,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed potential vulnerability in avatar gallery</li>
 </ul>
 
-<a name="205"></a><h3 class="h3">1.xvii. Changes since 2.0.5</h3>
+<a name="205"></a><h3 class="h3">1.xviii. Changes since 2.0.5</h3>
 
 <ul>
 <li>Fixed various email issues</li>
@@ -375,7 +389,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed sql injection with reset date format field in profile - <b>tendor</b></li>
 </ul>
 
-<a name="204"></a><h3 class="h3">1.xviii. Changes since 2.0.4</h3>
+<a name="204"></a><h3 class="h3">1.xix. Changes since 2.0.4</h3>
 
 <ul>
 <li>Removed user facing session_id checks</li>
@@ -447,7 +461,7 @@ p,ul,td {font-size:10pt;}
 <li>Default English support for visual confirmation - translators are encouraged to support this</li>
 </ul>
 
-<a name="203"></a><h3 class="h3">1.xix. Changes since 2.0.3</h3>
+<a name="203"></a><h3 class="h3">1.xx. Changes since 2.0.3</h3>
 
 <ul>
 <li>Fixed cross-browser scripting issue with highlight param</li>
@@ -574,7 +588,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed potential SQL vulnerability with marking of private messages - <b>Ulf Harnhammar</b></li>
 </ul>
 
-<a name="202"></a><h3 class="h3">1.xx. Changes since 2.0.2</h3>
+<a name="202"></a><h3 class="h3">1.xxi. Changes since 2.0.2</h3>
 
 <ul>
 <li>Fixed potential cross-site scripting vulnerability with avatars - <b>Showscout</b></li>
@@ -583,7 +597,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed (hopefully) issue with MS Access and multiple pages</li>
 </ul>
 
-<a name="201"></a><h3 class="h3">1.xxi. Changes since 2.0.1</h3>
+<a name="201"></a><h3 class="h3">1.xxii. Changes since 2.0.1</h3>
 
 <ul>
 <li>Fixed missing "username" lang variable in user admin template</li>
@@ -618,7 +632,7 @@ p,ul,td {font-size:10pt;}
 <li>Fix emailer to allow sending emails with language-specific character sets</li>
 </ul>
 
-<a name="200"></a><h3 class="h3">1.xxii. Changes since 2.0.0</h3>
+<a name="200"></a><h3 class="h3">1.xxiii. Changes since 2.0.0</h3>
 
 <ul>
 <li>Fixed delete image bug for normal users</li>
@@ -675,7 +689,7 @@ p,ul,td {font-size:10pt;}
 <li>Added database closure to admin frameset page</li>
 </ul>
 
-<a name="final"></a><h3 class="h3">1.xxiii. Changes since RC-4</h3>
+<a name="final"></a><h3 class="h3">1.xxiv. Changes since RC-4</h3>
 
 <ul>
 <li>Fixed improper report of general error when posting messages containing errors</li>
@@ -705,7 +719,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed various remaining usergroup display issues</li>
 </ul>
 
-<a name="rc4"></a><h3 class="h3">1.xxiv. Changes since RC-3</h3>
+<a name="rc4"></a><h3 class="h3">1.xxv. Changes since RC-3</h3>
 
 <ul>
 <li>Addressed serious security issue with included files</li>
@@ -736,7 +750,7 @@ p,ul,td {font-size:10pt;}
 <li>Fix (hopefully) remaining ICQ overlay issue with view profile in subSilver</li>
 </ul>
 
-<a name="rc3"></a><h3 class="h3">1.xxv. Changes since RC-2</h3>
+<a name="rc3"></a><h3 class="h3">1.xxvi. Changes since RC-2</h3>
 
 <ul>
 <li>Fixed infamous install parse error</li>
@@ -769,7 +783,7 @@ p,ul,td {font-size:10pt;}
 <li>Hidden usergroups are now completely hidden from view</li>
 </ul>
 
-<a name="rc2"></a><h3 class="h3">1.xxvi. Changes since RC-1</h3>
+<a name="rc2"></a><h3 class="h3">1.xxvii. Changes since RC-1</h3>
 
 <ul>
 <li>Fixed numerous PostgreSQL related issues</li>
@@ -789,7 +803,7 @@ p,ul,td {font-size:10pt;}
 <li>Various other fixes and updates</li>
 </ul>
 
-<a name="rc1"></a><h3 class="h3">1.xxvii. Changes since RC-1 (pre)</h3>
+<a name="rc1"></a><h3 class="h3">1.xxviii. Changes since RC-1 (pre)</h3>
 
 <ul>
 <li>Upgrade script completed for initial fully functional release</li>
diff --git a/phpBB/groupcp.php b/phpBB/groupcp.php
index cdf62749be..f675c79f1e 100644
--- a/phpBB/groupcp.php
+++ b/phpBB/groupcp.php
@@ -420,7 +420,7 @@ else if ( $group_id )
 							WHERE aa.group_id = g.group_id  
 						)
 					)
-				ORDER BY aa.auth_mod DESC";
+				ORDER BY auth_mod DESC";
 			break;
 
 		case 'oracle':
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index c7f6d5474c..37f6fef6c4 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -26,7 +26,7 @@
 //
 function make_forum_select($box_name, $ignore_forum = false, $select_forum = '')
 {
-	global $db, $userdata;
+	global $db, $userdata, $lang;
 
 	$is_auth_ary = auth(AUTH_READ, AUTH_LIST_ALL, $userdata);
 
@@ -49,7 +49,7 @@ function make_forum_select($box_name, $ignore_forum = false, $select_forum = '')
 		}
 	}
 
-	$forum_list = ( $forum_list == '' ) ? '<option value="-1">-- ! No Forums ! --</option>' : '<select name="' . $box_name . '">' . $forum_list . '</select>';
+	$forum_list = ( $forum_list == '' ) ? $lang['No_forums'] : '<select name="' . $box_name . '">' . $forum_list . '</select>';
 
 	return $forum_list;
 }
diff --git a/phpBB/language/lang_english/lang_admin.php b/phpBB/language/lang_english/lang_admin.php
index 264f69f943..ed915ca8ee 100644
--- a/phpBB/language/lang_english/lang_admin.php
+++ b/phpBB/language/lang_english/lang_admin.php
@@ -216,7 +216,7 @@ $lang['Ban_IP_explain'] = 'To specify several different IP addresses or hostname
 $lang['Ban_email'] = 'Ban one or more email addresses';
 $lang['Ban_email_explain'] = 'To specify more than one email address, separate them with commas. To specify a wildcard username, use * like *@hotmail.com';
 
-$lang['Unban_username'] = 'Un-ban one more specific users';
+$lang['Unban_username'] = 'Un-ban one or more specific users';
 $lang['Unban_username_explain'] = 'You can unban multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser';
 
 $lang['Unban_IP'] = 'Un-ban one or more IP addresses';
@@ -574,7 +574,7 @@ $lang['Disallow_explain'] = 'Here you can control usernames which will not be al
 
 $lang['Delete_disallow'] = 'Delete';
 $lang['Delete_disallow_title'] = 'Remove a Disallowed Username';
-$lang['Delete_disallow_explain'] = 'You can remove a disallowed username by selecting the username from this list and clicking submit';
+$lang['Delete_disallow_explain'] = 'You can remove a disallowed username by selecting the username from this list and clicking delete';
 
 $lang['Add_disallow'] = 'Add';
 $lang['Add_disallow_title'] = 'Add a disallowed username';
diff --git a/phpBB/templates/subSilver/admin/styles_edit_body.tpl b/phpBB/templates/subSilver/admin/styles_edit_body.tpl
index 939f6439ac..71e9e442c5 100755
--- a/phpBB/templates/subSilver/admin/styles_edit_body.tpl
+++ b/phpBB/templates/subSilver/admin/styles_edit_body.tpl
@@ -9,7 +9,7 @@
 	</tr>
 	<tr>
 		<td class="row1">{L_THEME_NAME}:</td>
-		<td class="row2" colspan="2"><input class="post" type="text" size="25" maxlength="100" name="style_name" value="{THEME_NAME}"></td>
+		<td class="row2" colspan="2"><input class="post" type="text" size="25" maxlength="30" name="style_name" value="{THEME_NAME}"></td>
 	</tr>
 	<tr>
 		<td class="row1">{L_TEMPLATE}:</td>
@@ -64,176 +64,176 @@
 	<tr>
 		<td class="row1">{L_TR_COLOR1}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="tr_color1" value="{TR_COLOR1}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="tr_color1_name" value="{TR_COLOR1_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="tr_color1_name" value="{TR_COLOR1_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TR_COLOR2}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="tr_color2" value="{TR_COLOR2}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="tr_color2_name" value="{TR_COLOR2_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="tr_color2_name" value="{TR_COLOR2_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TR_COLOR3}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="tr_color3" value="{TR_COLOR3}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="tr_color3_name" value="{TR_COLOR3_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="tr_color3_name" value="{TR_COLOR3_NAME}">
 	</tr>
 	<tr>
 		<td class="row1">{L_TR_CLASS1}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="tr_class1" value="{TR_CLASS1}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="tr_class1_name" value="{TR_CLASS1_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="tr_class1_name" value="{TR_CLASS1_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TR_CLASS2}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="tr_class2" value="{TR_CLASS2}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="tr_class2_name" value="{TR_CLASS2_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="tr_class2_name" value="{TR_CLASS2_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TR_CLASS3}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="tr_class3" value="{TR_CLASS3}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="tr_class3_name" value="{TR_CLASS3_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="tr_class3_name" value="{TR_CLASS3_NAME}">
 	</tr>
 	<tr>
 		<td class="row1">{L_TH_COLOR1}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="th_color1" value="{TH_COLOR1}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="th_color1_name" value="{TH_COLOR1_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="th_color1_name" value="{TH_COLOR1_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TH_COLOR2}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="th_color2" value="{TH_COLOR2}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="th_color2_name" value="{TH_COLOR2_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="th_color2_name" value="{TH_COLOR2_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TH_COLOR3}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="th_color3" value="{TH_COLOR3}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="th_color3_name" value="{TH_COLOR3_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="th_color3_name" value="{TH_COLOR3_NAME}">
 	</tr>
 	<tr>
 		<td class="row1">{L_TH_CLASS1}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="th_class1" value="{TH_CLASS1}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="th_class1_name" value="{TH_CLASS1_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="th_class1_name" value="{TH_CLASS1_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TH_CLASS2}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="th_class2" value="{TH_CLASS2}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="th_class2_name" value="{TH_CLASS2_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="th_class2_name" value="{TH_CLASS2_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TH_CLASS3}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="th_class3" value="{TH_CLASS3}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="th_class3_name" value="{TH_CLASS3_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="th_class3_name" value="{TH_CLASS3_NAME}">
 	</tr>
 	<tr>
 		<td class="row1">{L_TD_COLOR1}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="td_color1" value="{TD_COLOR1}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="td_color1_name" value="{TD_COLOR1_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="td_color1_name" value="{TD_COLOR1_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TD_COLOR2}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="td_color2" value="{TD_COLOR2}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="td_color2_name" value="{TD_COLOR2_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="td_color2_name" value="{TD_COLOR2_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TD_COLOR3}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="td_color3" value="{TD_COLOR3}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="td_color3_name" value="{TD_COLOR3_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="td_color3_name" value="{TD_COLOR3_NAME}">
 	</tr>
 	<tr>
 		<td class="row1">{L_TD_CLASS1}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="td_class1" value="{TD_CLASS1}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="td_class1_name" value="{TD_CLASS1_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="td_class1_name" value="{TD_CLASS1_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TD_CLASS2}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="td_class2" value="{TD_CLASS2}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="td_class2_name" value="{TD_CLASS2_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="td_class2_name" value="{TD_CLASS2_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TD_CLASS3}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="td_class3" value="{TD_CLASS3}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="td_class3_name" value="{TD_CLASS3_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="td_class3_name" value="{TD_CLASS3_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_FONTFACE_1}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontface1" value="{FONTFACE1}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="fontface1_name" value="{FONTFACE1_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontface1_name" value="{FONTFACE1_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_FONTFACE_2}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontface2" value="{FONTFACE2}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="fontface2_name" value="{FONTFACE2_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontface2_name" value="{FONTFACE2_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_FONTFACE_3}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontface3" value="{FONTFACE3}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="fontface3_name" value="{FONTFACE3_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontface3_name" value="{FONTFACE3_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_FONTSIZE_1}:</td>
 		<td class="row2"><input class="post" type="text" size="4" maxlength="4" name="fontsize1" value="{FONTSIZE1}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="fontsize1_name" value="{FONTSIZE1_NAME}">	
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontsize1_name" value="{FONTSIZE1_NAME}">	
 	</tr>
 
 	<tr>
 		<td class="row1">{L_FONTSIZE_2}:</td>
 		<td class="row2"><input class="post" type="text" size="4" maxlength="4" name="fontsize2" value="{FONTSIZE2}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="fontsize2_name" value="{FONTSIZE2_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontsize2_name" value="{FONTSIZE2_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_FONTSIZE_3}:</td>
 		<td class="row2"><input class="post" type="text" size="4" maxlength="4" name="fontsize3" value="{FONTSIZE3}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="fontsize3_name" value="{FONTSIZE3_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontsize3_name" value="{FONTSIZE3_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_FONTCOLOR_1}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="fontcolor1" value="{FONTCOLOR1}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="fontcolor1_name" value="{FONTCOLOR1_NAME}">	
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontcolor1_name" value="{FONTCOLOR1_NAME}">	
 	</tr>
 
 	<tr>
 		<td class="row1">{L_FONTCOLOR_2}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="fontcolor2" value="{FONTCOLOR2}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="fontcolor2_name" value="{FONTCOLOR2_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontcolor2_name" value="{FONTCOLOR2_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_FONTCOLOR_3}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="fontcolor3" value="{FONTCOLOR3}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="fontcolor3_name" value="{FONTCOLOR3_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontcolor3_name" value="{FONTCOLOR3_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_SPAN_CLASS_1}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="span_class1" value="{SPAN_CLASS1}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="span_class1_name" value="{SPAN_CLASS1_NAME}">	
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="span_class1_name" value="{SPAN_CLASS1_NAME}">	
 	</tr>
 
 	<tr>
 		<td class="row1">{L_SPAN_CLASS_2}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="span_class2" value="{SPAN_CLASS2}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="span_class2_name" value="{SPAN_CLASS2_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="span_class2_name" value="{SPAN_CLASS2_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_SPAN_CLASS_3}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="span_class3" value="{SPAN_CLASS3}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="span_class3_name" value="{SPAN_CLASS3_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="span_class3_name" value="{SPAN_CLASS3_NAME}">
 	</tr>
 
 
diff --git a/phpBB/templates/subSilver/posting_body.tpl b/phpBB/templates/subSilver/posting_body.tpl
index 94853d4bd7..a85da8f3e9 100644
--- a/phpBB/templates/subSilver/posting_body.tpl
+++ b/phpBB/templates/subSilver/posting_body.tpl
@@ -372,11 +372,11 @@ function storeCaret(textEl) {
 					  <option style="color:violet; background-color: {T_TD_COLOR1}" value="violet" class="genmed">{L_COLOR_VIOLET}</option>
 					  <option style="color:white; background-color: {T_TD_COLOR1}" value="white" class="genmed">{L_COLOR_WHITE}</option>
 					  <option style="color:black; background-color: {T_TD_COLOR1}" value="black" class="genmed">{L_COLOR_BLACK}</option>
-					</select> &nbsp;{L_FONT_SIZE}:<select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.selectedIndex=0;" onMouseOver="helpline('f')">
+					</select> &nbsp;{L_FONT_SIZE}:<select name="addbbcode20" selected onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.selectedIndex=0;" onMouseOver="helpline('f')">
 					  <option value="0" class="genmed">{L_FONT_SIZE}</option>
 					  <option value="7" class="genmed">{L_FONT_TINY}</option>
 					  <option value="9" class="genmed">{L_FONT_SMALL}</option>
-					  <option value="12" selected class="genmed">{L_FONT_NORMAL}</option>
+					  <option value="12" class="genmed">{L_FONT_NORMAL}</option>
 					  <option value="18" class="genmed">{L_FONT_LARGE}</option>
 					  <option  value="24" class="genmed">{L_FONT_HUGE}</option>
 					</select>