6 files changed, 19 insertions, 9 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 7ca2cbcdd0..5ecb18a001 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1018,7 +1018,8 @@ class session
 			// If the session is empty we need to create a valid one...
 			if (empty($this->session_id))
 			{
-				$this->session_create(ANONYMOUS);
+				// This seems to be no longer needed? - #14971
+//				$this->session_create(ANONYMOUS);
 			}
 
 			// Initiate environment ... since it won't be set at this stage
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 6fb2cd4881..720eddebcd 100755
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -482,7 +482,7 @@ class install_install extends module
 			'LEGEND_EXPLAIN'	=> $lang['FILES_OPTIONAL_EXPLAIN'],
 		));
 
-		$directories = array('config.'.$phpEx, 'images/avatars/upload/');
+		$directories = array('config.' . $phpEx, 'images/avatars/upload/');
 
 		foreach ($directories as $dir)
 		{
@@ -931,7 +931,7 @@ class install_install extends module
 			// Note that all we check is that the file has _something_ in it
 			// We don't compare the contents exactly - if they can't upload
 			// a single file correctly, it's likely they will have other problems....
-			if (filesize($phpbb_root_path . 'config.'.$phpEx) > 10)
+			if (filesize($phpbb_root_path . 'config.' . $phpEx) > 10)
 			{
 				$written = true;
 			}
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 5b109efdc5..0cc1064916 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -96,11 +96,11 @@ $lang = array_merge($lang, array(
 	'AVATAR_STORAGE_PATH'			=> 'Avatar storage path',
 	'AVATAR_STORAGE_PATH_EXPLAIN'	=> 'Path under your phpBB root directory, e.g. <samp>images/avatars/upload</samp>.',
 	'MAX_AVATAR_SIZE'				=> 'Maximum avatar dimensions',
-	'MAX_AVATAR_SIZE_EXPLAIN'		=> 'Height x Width in pixels.',
+	'MAX_AVATAR_SIZE_EXPLAIN'		=> 'Width x Height in pixels.',
 	'MAX_FILESIZE'					=> 'Maximum avatar file size',
 	'MAX_FILESIZE_EXPLAIN'			=> 'For uploaded avatar files.',
 	'MIN_AVATAR_SIZE'				=> 'Minimum avatar dimensions',
-	'MIN_AVATAR_SIZE_EXPLAIN'		=> 'Height x Width in pixels.',
+	'MIN_AVATAR_SIZE_EXPLAIN'		=> 'Width x Height in pixels.',
 ));
 
 // Message Settings
diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js
index 61747f7e56..5631ab67d1 100644
--- a/phpBB/styles/prosilver/template/editor.js
+++ b/phpBB/styles/prosilver/template/editor.js
@@ -34,7 +34,7 @@ function initInsertions()
 {
 	var doc;
 
-	if( document.forms[form_name])
+	if (document.forms[form_name])
 	{
 		doc = document;
 	}
@@ -44,11 +44,16 @@ function initInsertions()
 	}
 
 	var textarea = doc.forms[form_name].elements[text_name];
+
 	if (is_ie && typeof(baseHeight) != 'number')
 	{
 		textarea.focus();
 		baseHeight = doc.selection.createRange().duplicate().boundingHeight;
-		// document.body.focus();
+
+		if (!document.forms[form_name])
+		{
+			document.body.focus();
+		}
 	}
 }
 
diff --git a/phpBB/styles/prosilver/template/ucp_pm_options.html b/phpBB/styles/prosilver/template/ucp_pm_options.html
index 3fe24f04ee..db5781febf 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_options.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_options.html
@@ -14,7 +14,7 @@
 
 	<ol class="def-rules">
 	<!-- BEGIN rule -->
-		<li><input type="submit" name="delete_rule[{rule.RULE_ID}]" value="{L_DELETE_RULE}" class="right-box button2" /><strong>{L_IF}</strong> {rule.CHECK} <em>{rule.RULE}</em> <!-- IF rule.STRING --><strong>{rule.STRING}</strong> | <!-- ENDIF -->{rule.ACTION}<!-- IF rule.FOLDER -->: {rule.FOLDER}<!-- ENDIF --></li>
+		<li><div class="right-box"><input type="submit" name="delete_rule[{rule.RULE_ID}]" value="{L_DELETE_RULE}" class="button2" /></div><strong>{L_IF}</strong> {rule.CHECK} <em>{rule.RULE}</em> <!-- IF rule.STRING --><strong>{rule.STRING}</strong> | <!-- ENDIF -->{rule.ACTION}<!-- IF rule.FOLDER -->: {rule.FOLDER}<!-- ENDIF --></li>
 	<!-- BEGINELSE -->
 		<li><strong>{L_NO_RULES_DEFINED}</strong></li>
 	<!-- END rule -->
diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js
index 72de8ef8ff..53b8b6222f 100644
--- a/phpBB/styles/subsilver2/template/editor.js
+++ b/phpBB/styles/subsilver2/template/editor.js
@@ -48,7 +48,11 @@ function initInsertions()
 	{	
 		textarea.focus();
 		baseHeight = doc.selection.createRange().duplicate().boundingHeight;
-		// document.body.focus();
+
+		if (!document.forms[form_name])
+		{
+			document.body.focus();
+		}
 	}
 }