2 files changed, 51 insertions, 1 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php
index 7ee90b10ba..85ecd87c5f 100644
--- a/phpBB/phpbb/controller/helper.php
+++ b/phpBB/phpbb/controller/helper.php
@@ -189,9 +189,24 @@ class helper
 	*/
 	public function error($message, $code = 500)
 	{
+		return $this->message($message, false, $code);
+	}
+
+	/**
+	 * Output a message
+	 *
+	 * In case of an error, please throw an exception instead
+	 *
+	 * @param string $message The message to display
+	 * @param string|false $title Title for the message
+	 * @param int $code The HTTP status code (e.g. 404, 500, 503, etc.)
+	 * @return Response A Response instance
+	 */
+	public function message($message, $title = false, $code = 200)
+	{
 		$this->template->assign_vars(array(
 			'MESSAGE_TEXT'	=> $message,
-			'MESSAGE_TITLE'	=> $this->user->lang('INFORMATION'),
+			'MESSAGE_TITLE'	=> ($title === false) ? $this->user->lang('INFORMATION') : $title,
 		));
 
 		return $this->render('message_body.html', $this->user->lang('INFORMATION'), $code);
diff --git a/phpBB/phpbb/db/migration/data/v31x/v313rc1.php b/phpBB/phpbb/db/migration/data/v31x/v313rc1.php
new file mode 100644
index 0000000000..e50754f805
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v31x/v313rc1.php
@@ -0,0 +1,35 @@
+<?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.
+*
+*/
+
+namespace phpbb\db\migration\data\v31x;
+
+class v313rc1 extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v30x\release_3_0_13_rc1',
+			'\phpbb\db\migration\data\v31x\plupload_last_gc_dynamic',
+			'\phpbb\db\migration\data\v31x\profilefield_remove_underscore_from_alpha',
+			'\phpbb\db\migration\data\v31x\profilefield_yahoo_update_url',
+			'\phpbb\db\migration\data\v31x\update_custom_bbcodes_with_idn',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.1.3-RC1')),
+		);
+	}
+}