20 files changed, 342 insertions, 95 deletions
diff --git a/build/sami-all.conf.php b/build/sami-all.conf.php
index 68350fee8f..fb1a269206 100644
--- a/build/sami-all.conf.php
+++ b/build/sami-all.conf.php
@@ -18,13 +18,13 @@ $config['versions'] = Sami\Version\GitVersionCollection::create(__DIR__ . '/../'
 	This would be nice, but currently causes various problems that need
 	debugging.
 	->addFromTags('release-3.0.*')
-	->add('develop-olympus', '3.0-next (olympus)')
+	->add('3.0.x', '3.0-next (olympus)')
 	->addFromTags('release-3.1.*')
-	->add('develop-ascraeus', '3.1-next (ascraeus)')
-	->add('develop')
+	->add('3.1.x', '3.1-next (ascraeus)')
+	->add('master')
 	*/
-	->add('develop-olympus')
-	->add('develop-ascraeus')
+	->add('3.0.x')
+	->add('3.1.x')
 ;
 
 return new Sami\Sami($iterator, $config);
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 7711869200..28f8cf7bf0 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -840,6 +840,14 @@ overall_header_head_append
 * Since: 3.1.0-a1
 * Purpose: Add asset calls directly before the `</head>` tag
 
+overall_header_navbar_before
+===
+* Locations:
+    + styles/prosilver/template/overall_header.html
+    + styles/subsilver2/template/overall_header.html
+* Since: 3.1.4-RC1
+* Purpose: Add content before the navigation bar
+
 overall_header_navigation_append
 ===
 * Locations:
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 1241b8bd0e..10f1a5b8c1 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -226,6 +226,31 @@ class mcp_main
 			break;
 
 			default:
+				if ($quickmod)
+				{
+					switch ($action)
+					{
+						case 'lock':
+						case 'unlock':
+						case 'make_announce':
+						case 'make_sticky':
+						case 'make_global':
+						case 'make_normal':
+						case 'make_onindex':
+						case 'move':
+						case 'fork':
+						case 'delete_topic':
+							trigger_error('TOPIC_NOT_EXIST');
+						break;
+
+						case 'lock_post':
+						case 'unlock_post':
+						case 'delete_post':
+							trigger_error('POST_NOT_EXIST');
+						break;
+					}
+				}
+
 				trigger_error('NO_MODE', E_USER_ERROR);
 			break;
 		}
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 04a2726d22..63e027cd66 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -21,6 +21,19 @@ if (!defined('IN_PHPBB'))
 
 if (!class_exists('bbcode'))
 {
+	// The following lines are for extensions which include message_parser.php
+	// while $phpbb_root_path and $phpEx are out of the script scope
+	// which may lead to the 'Undefined variable' and 'failed to open stream' errors
+	if (!isset($phpbb_root_path))
+	{
+		global $phpbb_root_path;
+	}
+
+	if (!isset($phpEx))
+	{
+		global $phpEx;
+	}
+
 	include($phpbb_root_path . 'includes/bbcode.' . $phpEx);
 }
 
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 3a6858a254..6f7fbd9d5f 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1164,12 +1164,10 @@ class install_install extends module
 
 			foreach ($sql_query as $sql)
 			{
-				//$sql = trim(str_replace('|', ';', $sql));
-				if (!$db->sql_query($sql))
-				{
-					$error = $db->sql_error();
-					$this->p_master->db_error($error['message'], $sql, __LINE__, __FILE__);
-				}
+				// Ignore errors when the functions or types already exist
+				// to allow installing phpBB twice in the same database with
+				// a different prefix
+				$db->sql_query($sql);
 			}
 			unset($sql_query);
 		}
diff --git a/phpBB/phpbb/avatar/driver/local.php b/phpBB/phpbb/avatar/driver/local.php
index 8888686b2d..36087f8ba0 100644
--- a/phpBB/phpbb/avatar/driver/local.php
+++ b/phpBB/phpbb/avatar/driver/local.php
@@ -23,8 +23,10 @@ class local extends \phpbb\avatar\driver\driver
 	*/
 	public function get_data($row)
 	{
+		$root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $this->path_helper->get_web_root_path();
+
 		return array(
-			'src' => $this->path_helper->get_web_root_path() . $this->config['avatar_gallery_path'] . '/' . $row['avatar'],
+			'src' => $root_path . $this->config['avatar_gallery_path'] . '/' . $row['avatar'],
 			'width' => $row['avatar_width'],
 			'height' => $row['avatar_height'],
 		);
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php
index 003b23659f..ee36243844 100644
--- a/phpBB/phpbb/avatar/driver/upload.php
+++ b/phpBB/phpbb/avatar/driver/upload.php
@@ -48,8 +48,10 @@ class upload extends \phpbb\avatar\driver\driver
 	*/
 	public function get_data($row, $ignore_config = false)
 	{
+		$root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $this->path_helper->get_web_root_path();
+
 		return array(
-			'src' => $this->path_helper->get_web_root_path() . 'download/file.' . $this->php_ext . '?avatar=' . $row['avatar'],
+			'src' => $root_path . 'download/file.' . $this->php_ext . '?avatar=' . $row['avatar'],
 			'width' => $row['avatar_width'],
 			'height' => $row['avatar_height'],
 		);
diff --git a/phpBB/phpbb/captcha/plugins/qa.php b/phpBB/phpbb/captcha/plugins/qa.php
index a7ba994cc3..04052b3406 100644
--- a/phpBB/phpbb/captcha/plugins/qa.php
+++ b/phpBB/phpbb/captcha/plugins/qa.php
@@ -125,7 +125,7 @@ class qa
 	*/
 	public function is_available()
 	{
-		global $config, $db, $phpbb_root_path, $phpEx, $user;
+		global $config, $db, $user;
 
 		// load language file for pretty display in the ACP dropdown
 		$user->add_lang('captcha_qa');
@@ -263,7 +263,7 @@ class qa
 	*/
 	function garbage_collect($type = 0)
 	{
-		global $db, $config;
+		global $db;
 
 		$sql = 'SELECT c.confirm_id
 			FROM ' . $this->table_qa_confirm . ' c
@@ -310,8 +310,6 @@ class qa
 
 		$db_tool = new \phpbb\db\tools($db);
 
-		$tables = array($this->table_captcha_questions, $this->table_captcha_answers, $this->table_qa_confirm);
-
 		$schemas = array(
 				$this->table_captcha_questions		=> array (
 					'COLUMNS' => array(
@@ -366,7 +364,7 @@ class qa
 	*/
 	function validate()
 	{
-		global $config, $db, $user;
+		global $user;
 
 		$error = '';
 
@@ -414,7 +412,7 @@ class qa
 
 		if (!sizeof($this->question_ids))
 		{
-			return false;
+			return;
 		}
 		$this->confirm_id = md5(unique_id($user->ip));
 		$this->question = (int) array_rand($this->question_ids);
@@ -440,7 +438,7 @@ class qa
 
 		if (!sizeof($this->question_ids))
 		{
-			return false;
+			return;
 		}
 
 		$this->question = (int) array_rand($this->question_ids);
@@ -611,8 +609,8 @@ class qa
 	*/
 	function acp_page($id, &$module)
 	{
-		global $db, $user, $auth, $template;
-		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
+		global $user, $template;
+		global $config;
 
 		$user->add_lang('acp/board');
 		$user->add_lang('captcha_qa');
@@ -674,11 +672,7 @@ class qa
 		else
 		{
 			// okay, show the editor
-			$error = false;
-			$input_question = request_var('question_text', '', true);
-			$input_answers = request_var('answers', '', true);
-			$input_lang = request_var('lang_iso', '', true);
-			$input_strict = request_var('strict', false);
+			$question_input = $this->acp_get_question_input();
 			$langs = $this->get_languages();
 
 			foreach ($langs as $lang => $entry)
@@ -697,13 +691,11 @@ class qa
 			{
 				if ($question = $this->acp_get_question_data($question_id))
 				{
-					$answers = (isset($input_answers[$lang])) ? $input_answers[$lang] : implode("\n", $question['answers']);
-
 					$template->assign_vars(array(
-						'QUESTION_TEXT'		=> ($input_question) ? $input_question : $question['question_text'],
-						'LANG_ISO'			=> ($input_lang) ? $input_lang : $question['lang_iso'],
-						'STRICT'			=> (isset($_REQUEST['strict'])) ? $input_strict : $question['strict'],
-						'ANSWERS'			=> $answers,
+						'QUESTION_TEXT'		=> ($question_input['question_text']) ? $question_input['question_text'] : $question['question_text'],
+						'LANG_ISO'			=> ($question_input['lang_iso']) ? $question_input['lang_iso'] : $question['lang_iso'],
+						'STRICT'			=> (isset($_REQUEST['strict'])) ? $question_input['strict'] : $question['strict'],
+						'ANSWERS'			=> implode("\n", $question['answers']),
 					));
 				}
 				else
@@ -714,18 +706,16 @@ class qa
 			else
 			{
 				$template->assign_vars(array(
-					'QUESTION_TEXT'		=> $input_question,
-					'LANG_ISO'			=> $input_lang,
-					'STRICT'			=> $input_strict,
-					'ANSWERS'			=> $input_answers,
+					'QUESTION_TEXT'		=> $question_input['question_text'],
+					'LANG_ISO'			=> $question_input['lang_iso'],
+					'STRICT'			=> $question_input['strict'],
+					'ANSWERS'			=> (is_array($question_input['answers'])) ? implode("\n", $question_input['answers']) : '',
 				));
 			}
 
 			if ($submit && check_form_key($form_key))
 			{
-				$data = $this->acp_get_question_input();
-
-				if (!$this->validate_input($data))
+				if (!$this->validate_input($question_input))
 				{
 					$template->assign_vars(array(
 						'S_ERROR'			=> true,
@@ -735,11 +725,11 @@ class qa
 				{
 					if ($question_id)
 					{
-						$this->acp_update_question($data, $question_id);
+						$this->acp_update_question($question_input, $question_id);
 					}
 					else
 					{
-						$this->acp_add_question($data);
+						$this->acp_add_question($question_input);
 					}
 
 					add_log('admin', 'LOG_CONFIG_VISUAL');
@@ -819,6 +809,8 @@ class qa
 
 			return $question;
 		}
+
+		return false;
 	}
 
 	/**
@@ -827,13 +819,21 @@ class qa
 	function acp_get_question_input()
 	{
 		$answers = utf8_normalize_nfc(request_var('answers', '', true));
+
+		// Convert answers into array and filter if answers are set
+		if (strlen($answers))
+		{
+			$answers = array_filter(array_map('trim', explode("\n", $answers)), function ($value) {
+				return $value !== '';
+			});
+		}
+
 		$question = array(
 			'question_text'	=> request_var('question_text', '', true),
 			'strict'		=> request_var('strict', false),
 			'lang_iso'		=> request_var('lang_iso', ''),
-			'answers'		=> (strlen($answers)) ? explode("\n", $answers) : '',
+			'answers'		=> $answers,
 		);
-
 		return $question;
 	}
 
diff --git a/phpBB/phpbb/content_visibility.php b/phpBB/phpbb/content_visibility.php
index 700009da6a..0ba0489cb7 100644
--- a/phpBB/phpbb/content_visibility.php
+++ b/phpBB/phpbb/content_visibility.php
@@ -237,7 +237,7 @@ class content_visibility
 			if (!sizeof($forum_ids))
 			{
 				// The user can see all posts/topics in all specified forums
-				return $this->db->sql_in_set($table_alias . 'forum_id', $approve_forums);
+				return $where_sql . $this->db->sql_in_set($table_alias . 'forum_id', $approve_forums) . ')';
 			}
 			else
 			{
@@ -248,8 +248,8 @@ class content_visibility
 		else
 		{
 			// The user is just a normal user
-			return $table_alias . $mode . '_visibility = ' . ITEM_APPROVED . '
-				AND ' . $this->db->sql_in_set($table_alias . 'forum_id', $forum_ids, false, true);
+			return $where_sql . $table_alias . $mode . '_visibility = ' . ITEM_APPROVED . '
+				AND ' . $this->db->sql_in_set($table_alias . 'forum_id', $forum_ids, false, true) . ')';
 		}
 
 		$where_sql .= '(' . $table_alias . $mode . '_visibility = ' . ITEM_APPROVED . '
diff --git a/phpBB/phpbb/db/migration/data/v310/avatars.php b/phpBB/phpbb/db/migration/data/v310/avatars.php
index 2698adeed5..9b03a8fa94 100644
--- a/phpBB/phpbb/db/migration/data/v310/avatars.php
+++ b/phpBB/phpbb/db/migration/data/v310/avatars.php
@@ -17,7 +17,29 @@ class avatars extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
-		return isset($this->config['allow_avatar_gravatar']);
+		// Get current avatar type of guest user
+		$sql = 'SELECT user_avatar_type
+			FROM ' . $this->table_prefix . 'users
+			WHERE user_id = ' . ANONYMOUS;
+		$result = $this->db->sql_query($sql);
+		$backup_type = $this->db->sql_fetchfield('user_avatar_type');
+		$this->db->sql_freeresult($result);
+
+		// Try to set avatar type to string
+		$sql = 'UPDATE ' . $this->table_prefix . "users
+			SET user_avatar_type = 'avatar.driver.upload'
+			WHERE user_id = " . ANONYMOUS;
+		$this->db->sql_return_on_error(true);
+		$effectively_installed = $this->db->sql_query($sql);
+		$this->db->sql_return_on_error();
+
+		// Restore avatar type of guest user to previous state
+		$sql = 'UPDATE ' . $this->table_prefix . "users
+			SET user_avatar_type = '{$backup_type}'
+			WHERE user_id = " . ANONYMOUS;
+		$this->db->sql_query($sql);
+
+		return $effectively_installed !== false;
 	}
 
 	static public function depends_on()
diff --git a/phpBB/posting.php b/phpBB/posting.php
index a65ba46fc9..f0446cf2db 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -330,14 +330,17 @@ switch ($mode)
 		{
 			$is_authed = true;
 		}
-	break;
+
+	// no break;
 
 	case 'soft_delete':
-		if ($user->data['is_registered'] && $phpbb_content_visibility->can_soft_delete($forum_id, $post_data['poster_id'], $post_data['post_edit_locked']))
+		if (!$is_authed && $user->data['is_registered'] && $phpbb_content_visibility->can_soft_delete($forum_id, $post_data['poster_id'], $post_data['post_edit_locked']))
 		{
+			// Fall back to soft_delete if we have no permissions to delete posts but to soft delete them
 			$is_authed = true;
+			$mode = 'soft_delete';
 		}
-		else
+		else if (!$is_authed)
 		{
 			// Display the same error message for softdelete we use for delete
 			$mode = 'delete';
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index c4dbb6a035..e0c8e51d25 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -85,7 +85,7 @@
 
 			</div>
 		</div>
-
+		<!-- EVENT overall_header_navbar_before -->
 		<!-- INCLUDE navbar_header.html -->
 	</div>
 
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index d9bf9f9fa5..f3468ebcf2 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -182,8 +182,7 @@
 
 /* Misc layout styles
 ---------------------------------------- */
-/* column[1-2] styles are containers for two column layouts
-   Also see tweaks.css */
+/* column[1-2] styles are containers for two column layouts */
 .rtl .column1 {
 	float: right;
 	clear: right;
@@ -603,9 +602,6 @@ li.breadcrumbs span:first-child > a {
 /**
 * buttons.css
 */
-/* Rollover buttons
-   Based on: http://wellstyled.com/css-nopreload-rollovers.html
-----------------------------------------*/
 .rtl .dropdown-select {
 	padding-left: 24px;
 	padding-right: 8px;
@@ -983,10 +979,6 @@ li.breadcrumbs span:first-child > a {
 	padding-left: 0;
 }
 
-/**
-* tweaks.css
-*/
-
 
 /* Form button styles
 ---------------------------------------- */
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index aecac4defd..f9a520369e 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -1,9 +1,6 @@
 /* Button Styles
 ---------------------------------------- */
 
-/* Rollover buttons
-   Based on: http://wellstyled.com/css-nopreload-rollovers.html
-----------------------------------------*/
 .button {
 	cursor: pointer;
 	display: inline-block;
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 11e3314f17..c0cc2bb2dd 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -53,9 +53,7 @@ html {
 }
 
 body {
-	/* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */
 	font-family: Verdana, Helvetica, Arial, sans-serif;
-	/*font-size: 62.5%;			 This sets the default font size to be equivalent to 10px */
 	font-size: 10px;
 	line-height: normal;
 	margin: 0;
@@ -113,7 +111,6 @@ img {
 }
 
 hr {
-	/* Also see tweaks.css */
 	border: 0 solid transparent;
 	border-top-width: 1px;
 	height: 1px;
@@ -713,8 +710,7 @@ table.info tbody th {
 
 /* Misc layout styles
 ---------------------------------------- */
-/* column[1-2] styles are containers for two column layouts
-   Also see tweaks.css */
+/* column[1-2] styles are containers for two column layouts */
 .column1 {
 	float: left;
 	clear: left;
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index e73f8c9d54..380b285b83 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -259,7 +259,6 @@ dd.option {
 }
 
 .postbody h3 img {
-	/* Also see tweaks.css */
 	vertical-align: bottom;
 }
 
@@ -510,7 +509,6 @@ blockquote .codebox {
 }
 
 .codebox code {
-	/* Also see tweaks.css */
 	overflow: auto;
 	display: block;
 	height: auto;
@@ -693,7 +691,6 @@ fieldset.polls dd div {
 /* Poster profile block
 ----------------------------------------*/
 .postprofile {
-	/* Also see tweaks.css */
 	margin: 5px 0 10px 0;
 	min-height: 80px;
 	border: 1px solid transparent;
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 225a7d85ff..f3693eb865 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -152,7 +152,7 @@ function marklist(id, name, state)
 		</tr>
 		</table>
 	</div>
-
+	<!-- EVENT overall_header_navbar_before -->
 	<div id="menubar">
 		<table width="100%" cellspacing="0">
 		<tr>
diff --git a/tests/captcha/qa_test.php b/tests/captcha/qa_test.php
new file mode 100644
index 0000000000..1f2f9f3070
--- /dev/null
+++ b/tests/captcha/qa_test.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+
+class phpbb_captcha_qa_test extends \phpbb_database_test_case
+{
+	protected $request;
+
+	/** @var \phpbb\captcha\plugins\qa */
+	protected $qa;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/../fixtures/empty.xml');
+	}
+
+	public function setUp()
+	{
+		global $db;
+
+		$db = $this->new_dbal();
+
+		parent::setUp();
+
+		$this->request = new \phpbb_mock_request();
+		request_var(false, false, false, false, $this->request);
+		$this->qa = new \phpbb\captcha\plugins\qa('phpbb_captcha_questions', 'phpbb_captcha_answers', 'phpbb_qa_confirm');
+	}
+
+	public function test_is_installed()
+	{
+		$this->assertFalse($this->qa->is_installed());
+
+		$this->qa->install();
+
+		$this->assertTrue($this->qa->is_installed());
+	}
+
+	public function test_set_get_name()
+	{
+		$this->assertNull($this->qa->get_service_name());
+		$this->qa->set_name('foobar');
+		$this->assertSame('foobar', $this->qa->get_service_name());
+	}
+
+	public function data_acp_get_question_input()
+	{
+		return array(
+			array("foobar\ntest\nyes", array(
+				'question_text'	=> '',
+				'strict'	=> false,
+				'lang_iso'	=> '',
+				'answers'	=> array('foobar', 'test', 'yes')
+			)),
+			array("foobar\ntest\n \nyes", array(
+				'question_text'	=> '',
+				'strict'	=> false,
+				'lang_iso'	=> '',
+				'answers'	=> array(
+					0 => 'foobar',
+					1 => 'test',
+					3 => 'yes',
+				)
+			)),
+			array('', array(
+				'question_text'	=> '',
+				'strict'	=> false,
+				'lang_iso'	=> '',
+				'answers'	=> '',
+			)),
+		);
+	}
+
+	/**
+	 * @dataProvider data_acp_get_question_input
+	 */
+	public function test_acp_get_question_input($value, $expected)
+	{
+		$this->request->overwrite('answers', $value);
+
+		$this->assertEquals($expected, $this->qa->acp_get_question_input());
+	}
+}
diff --git a/tests/functional/visibility_softdelete_test.php b/tests/functional/visibility_softdelete_test.php
index 794f0cde68..39efc99a35 100644
--- a/tests/functional/visibility_softdelete_test.php
+++ b/tests/functional/visibility_softdelete_test.php
@@ -42,6 +42,19 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'forum_perm_from'	=> 2,
 		));
 		$crawler = self::submit($form);
+
+		// Create second user which does not have m_delete permission
+		$this->add_lang('acp/permissions');
+
+		$second_user = $this->create_user('no m_delete moderator');
+		$this->add_user_group("GLOBAL_MODERATORS", 'no m_delete moderator', true);
+
+		// Set m_delete to never
+		$crawler = self::request('GET', "adm/index.php?i=acp_permissions&icat=16&mode=setting_user_global&user_id[0]=$second_user&type=m_&sid={$this->sid}");
+		$form = $crawler->selectButton($this->lang('APPLY_PERMISSIONS'))->form();
+		$data = array("setting[$second_user][0][m_delete]" => ACL_NEVER);
+		$form->setValues($data);
+		$crawler = self::submit($form);
 	}
 
 	public function test_create_post()
@@ -98,6 +111,23 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'forum_topics_softdeleted'	=> 0,
 			'forum_last_post_id'		=> $this->data['posts']['Re: Soft Delete Topic #1-#2'],
 		), 'after replying');
+
+		// Test creating another reply
+		$post3 = $this->create_post($this->data['forums']['Soft Delete #1'], $post['topic_id'], 'Re: Soft Delete Topic #1-#3', 'This is another test post posted by the testing framework.');
+		$crawler = self::request('GET', "viewtopic.php?t={$post3['topic_id']}&sid={$this->sid}");
+
+		$this->assertContains('Re: Soft Delete Topic #1-#3', $crawler->filter('html')->text());
+		$this->data['posts']['Re: Soft Delete Topic #1-#3'] = (int) $post3['post_id'];
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 3,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Re: Soft Delete Topic #1-#3'],
+		), 'after replying a second time');
 	}
 
 	public function test_softdelete_post()
@@ -114,21 +144,22 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'posts' => array(
 				'Soft Delete Topic #1',
 				'Re: Soft Delete Topic #1-#2',
+				'Re: Soft Delete Topic #1-#3',
 			),
 		));
 
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 2,
+			'forum_posts_approved'		=> 3,
 			'forum_posts_unapproved'	=> 0,
 			'forum_posts_softdeleted'	=> 0,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Re: Soft Delete Topic #1-#2'],
+			'forum_last_post_id'		=> $this->data['posts']['Re: Soft Delete Topic #1-#3'],
 		), 'before softdelete');
 
 		$this->add_lang('posting');
-		$crawler = self::request('GET', "posting.php?mode=delete&f={$this->data['forums']['Soft Delete #1']}&p={$this->data['posts']['Re: Soft Delete Topic #1-#2']}&sid={$this->sid}");
+		$crawler = self::request('GET', "posting.php?mode=delete&f={$this->data['forums']['Soft Delete #1']}&p={$this->data['posts']['Re: Soft Delete Topic #1-#3']}&sid={$this->sid}");
 		$this->assertContainsLang('DELETE_PERMANENTLY', $crawler->text());
 
 		$form = $crawler->selectButton('Yes')->form();
@@ -136,19 +167,69 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assertContainsLang('POST_DELETED', $crawler->text());
 
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 1,
+			'forum_posts_approved'		=> 2,
 			'forum_posts_unapproved'	=> 0,
 			'forum_posts_softdeleted'	=> 1,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
+			'forum_last_post_id'		=> $this->data['posts']['Re: Soft Delete Topic #1-#2'],
 		), 'after softdelete');
 
 		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
 		$this->assertContains($this->lang('POST_DISPLAY', '', ''), $crawler->text());
 	}
 
+	public function test_softdelete_post_no_m_delete()
+	{
+		$this->login('no m_delete moderator');
+		$this->load_ids(array(
+			'forums' => array(
+				'Soft Delete #1',
+				'Soft Delete #2',
+			),
+			'topics' => array(
+				'Soft Delete Topic #1',
+			),
+			'posts' => array(
+				'Soft Delete Topic #1',
+				'Re: Soft Delete Topic #1-#2',
+				'Re: Soft Delete Topic #1-#3',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 2,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 1,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Re: Soft Delete Topic #1-#2'],
+		), 'before softdelete without m_delete');
+
+		$this->add_lang('posting');
+		$crawler = self::request('GET', "posting.php?mode=delete&f={$this->data['forums']['Soft Delete #1']}&p={$this->data['posts']['Re: Soft Delete Topic #1-#2']}&sid={$this->sid}");
+		$this->assertNotContainsLang('DELETE_PERMANENTLY', $crawler->text());
+
+		$form = $crawler->selectButton('Yes')->form();
+		$crawler = self::submit($form);
+		$this->assertContainsLang('POST_DELETED', $crawler->text());
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 2,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
+		), 'after softdelete without m_delete');
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
+		$this->assertContains($this->lang('POST_DISPLAY', '', ''), $crawler->text());
+	}
+
 	public function test_move_softdeleted_post()
 	{
 		$this->login();
@@ -163,13 +244,14 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'posts' => array(
 				'Soft Delete Topic #1',
 				'Re: Soft Delete Topic #1-#2',
+				'Re: Soft Delete Topic #1-#3',
 			),
 		));
 
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
@@ -212,7 +294,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
@@ -234,6 +316,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'posts' => array(
 				'Soft Delete Topic #1',
 				'Re: Soft Delete Topic #1-#2',
+				'Re: Soft Delete Topic #1-#3'
 			),
 		));
 
@@ -250,7 +333,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
@@ -283,7 +366,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
 			'forum_posts_approved'		=> 0,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 2,
+			'forum_posts_softdeleted'	=> 3,
 			'forum_topics_approved'		=> 0,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 1,
@@ -305,6 +388,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'posts' => array(
 				'Soft Delete Topic #1',
 				'Re: Soft Delete Topic #1-#2',
+				'Re: Soft Delete Topic #1-#3'
 			),
 		));
 
@@ -321,7 +405,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
 			'forum_posts_approved'		=> 0,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 2,
+			'forum_posts_softdeleted'	=> 3,
 			'forum_topics_approved'		=> 0,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 1,
@@ -344,7 +428,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 0,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 2,
+			'forum_posts_softdeleted'	=> 3,
 			'forum_topics_approved'		=> 0,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 1,
@@ -376,13 +460,14 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'posts' => array(
 				'Soft Delete Topic #1',
 				'Re: Soft Delete Topic #1-#2',
+				'Re: Soft Delete Topic #1-#3'
 			),
 		));
 
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 0,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 2,
+			'forum_posts_softdeleted'	=> 3,
 			'forum_topics_approved'		=> 0,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 1,
@@ -417,7 +502,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
@@ -449,13 +534,14 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'posts' => array(
 				'Soft Delete Topic #1',
 				'Re: Soft Delete Topic #1-#2',
+				'Re: Soft Delete Topic #1-#3'
 			),
 		));
 
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
@@ -495,7 +581,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 0,
+			'forum_posts_softdeleted'	=> 1,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
@@ -528,6 +614,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'posts' => array(
 				'Soft Delete Topic #1',
 				'Re: Soft Delete Topic #1-#2',
+				'Re: Soft Delete Topic #1-#3'
 			),
 		));
 
@@ -539,7 +626,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 1,
@@ -562,13 +649,14 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'posts' => array(
 				'Soft Delete Topic #1',
 				'Re: Soft Delete Topic #1-#2',
+				'Re: Soft Delete Topic #1-#3'
 			),
 		));
 
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 1,
@@ -603,7 +691,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
@@ -625,13 +713,14 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'posts' => array(
 				'Soft Delete Topic #1',
 				'Re: Soft Delete Topic #1-#2',
+				'Re: Soft Delete Topic #1-#3'
 			),
 		));
 
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
@@ -660,7 +749,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
@@ -670,11 +759,11 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'] + 2,
+			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'] + 3,
 		), 'after forking #2');
 	}
 
diff --git a/tests/functions_acp/validate_config_vars_test.php b/tests/functions_acp/validate_config_vars_test.php
index 4bf6ba3984..32738e4351 100644
--- a/tests/functions_acp/validate_config_vars_test.php
+++ b/tests/functions_acp/validate_config_vars_test.php
@@ -200,6 +200,15 @@ class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case
 			$config_ary,
 			$error
 		);
+
+		if ($expected === true)
+		{
+			$this->assertEmpty($error);
+		}
+		else
+		{
+			$this->assertEquals(array($expected), $error);
+		}
 	}
 
 	public function data_validate_path_windows()