6 files changed, 32 insertions, 14 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 4c568cf441..92bcf90039 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -432,6 +432,20 @@ function validate_config_vars($config_vars, &$cfg_array, &$error)
 				{
 					$error[] = sprintf($user->lang['SETTING_TOO_BIG'], $user->lang[$config_definition['lang']], $validator[$max]);
 				}
+
+				if (strpos($config_name, '_max') !== false)
+				{
+					// Min/max pairs of settings should ensure that min <= max
+					// Replace _max with _min to find the name of the minimum
+					// corresponding configuration variable
+					$min_name = str_replace('_max', '_min', $config_name);
+
+					if (isset($cfg_array[$min_name]) && is_numeric($cfg_array[$min_name]) && $cfg_array[$config_name] < $cfg_array[$min_name])
+					{
+						// A minimum value exists and the maximum value is less than it
+						$error[] = sprintf($user->lang['SETTING_TOO_LOW'], $user->lang[$config_definition['lang']], (int) $cfg_array[$min_name]);
+					}
+				}
 			break;
 
 			// Absolute path
diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
index 84677c4e15..d6af9d1db9 100644
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -26,8 +26,8 @@ phpBB Developers:      A_Jelly_Doughnut (Josh Woody)
                        Acyd Burn (Meik Sievertsen) [Lead 09/2005 - 01/2010]
                        APTX (Marek A. R.)
                        bantu (Andreas Fischer)
-                       DavidMJ (David M.)
                        dhn (Dominik Dröscher)
+                       evil<3 (Igor Wiedler)
                        kellanved (Henry Sudhof)
                        nickvergessen (Joas Schilling)
                        rxu (Ruslan Uzdenov)
@@ -49,6 +49,7 @@ phpBB Lead Developer:  psoTFX (Paul S. Owen) [2001 - 09/2005]
 
 phpBB Developers:      Ashe (Ludovic Arnaud)       [10/2002 - 11/2003, 06/2006 - 10/2006]
                        BartVB (Bart van Bragt)     [11/2000 - 03/2006]
+                       DavidMJ (David M.)          [12/2005 - 08/2009]
                        GrahamJE (Graham Eames)     [09/2005 - 11/2006]
                        Vic D'Elfant (Vic D'Elfant) [04/2007 - 04/2009]
 
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index e43881fab2..c419da5574 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -428,7 +428,7 @@ class mcp_queue
 
 						'POST_ID'		=> $row['post_id'],
 						'FORUM_NAME'	=> (!$global_topic) ? $forum_names[$row['forum_id']] : $user->lang['GLOBAL_ANNOUNCEMENT'],
-						'POST_SUBJECT'	=> $row['post_subject'],
+						'POST_SUBJECT'	=> ($row['post_subject'] != '') ? $row['post_subject'] : $user->lang['NO_SUBJECT'],
 						'TOPIC_TITLE'	=> $row['topic_title'],
 						'POST_TIME'		=> $user->format_date($row['post_time']))
 					);
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
index b80c7673e3..78224dd5da 100644
--- a/phpBB/install/convertors/functions_phpbb20.php
+++ b/phpBB/install/convertors/functions_phpbb20.php
@@ -1239,9 +1239,9 @@ function phpbb_prepare_message($message)
 	// Already the new user id ;)
 	$user_id = $convert->row['poster_id'];
 
+	$message = str_replace('<br />', "\n", $message);
 	$message = str_replace('<', '&lt;', $message);
 	$message = str_replace('>', '&gt;', $message);
-	$message = str_replace('<br />', "\n", $message);
 
 	// make the post UTF-8
 	$message = phpbb_set_encoding($message);
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 8cacac2910..853ac18aad 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -402,15 +402,18 @@ if ($post_data['poll_start'])
 	$db->sql_freeresult($result);
 }
 
-$original_poll_data = array(
-	'poll_title'		=> $post_data['poll_title'],
-	'poll_length'		=> $post_data['poll_length'],
-	'poll_max_options'	=> $post_data['poll_max_options'],
-	'poll_option_text'	=> implode("\n", $post_data['poll_options']),
-	'poll_start'		=> $post_data['poll_start'],
-	'poll_last_vote'	=> $post_data['poll_last_vote'],
-	'poll_vote_change'	=> $post_data['poll_vote_change'],
-);
+if ($mode == 'edit')
+{
+	$original_poll_data = array(
+		'poll_title'		=> $post_data['poll_title'],
+		'poll_length'		=> $post_data['poll_length'],
+		'poll_max_options'	=> $post_data['poll_max_options'],
+		'poll_option_text'	=> implode("\n", $post_data['poll_options']),
+		'poll_start'		=> $post_data['poll_start'],
+		'poll_last_vote'	=> $post_data['poll_last_vote'],
+		'poll_vote_change'	=> $post_data['poll_vote_change'],
+	);
+}
 
 $orig_poll_options_size = sizeof($post_data['poll_options']);
 
@@ -1297,7 +1300,7 @@ $attachment_data = $message_parser->attachment_data;
 $filename_data = $message_parser->filename_data;
 $post_data['post_text'] = $message_parser->message;
 
-if (sizeof($post_data['poll_options']) && $post_data['poll_title'])
+if (sizeof($post_data['poll_options']) || $post_data['poll_title'])
 {
 	$message_parser->message = $post_data['poll_title'];
 	$message_parser->bbcode_uid = $post_data['bbcode_uid'];
diff --git a/phpBB/search.php b/phpBB/search.php
index 96f320fe9f..9e54820c25 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -892,7 +892,7 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 
 					'S_TOPIC_GLOBAL'		=> (!$forum_id) ? true : false,
 					'S_TOPIC_TYPE'			=> $row['topic_type'],
-					'S_USER_POSTED'			=> (!empty($row['mark_type'])) ? true : false,
+					'S_USER_POSTED'			=> (!empty($row['topic_posted'])) ? true : false,
 					'S_UNREAD_TOPIC'		=> $unread_topic,
 
 					'S_TOPIC_REPORTED'		=> (!empty($row['topic_reported']) && $auth->acl_get('m_report', $forum_id)) ? true : false,