From 1952a4f276930edd16ca51fd690ed3e7965071da Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 16 Nov 2012 10:38:40 -0500
Subject: [PATCH] [feature/controller] Flip method parameters, require $message

PHPBB3-10864
---
 phpBB/includes/controller/helper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/controller/helper.php b/phpBB/includes/controller/helper.php
index 6dc3ec4626..6cacc8fefa 100644
--- a/phpBB/includes/controller/helper.php
+++ b/phpBB/includes/controller/helper.php
@@ -101,11 +101,11 @@ class phpbb_controller_helper
 	/**
 	* Output an error, effectively the same thing as trigger_error
 	*
-	* @param string $code The error code (e.g. 404, 500, 503, etc.)
 	* @param string $message The error message
+	* @param string $code The error code (e.g. 404, 500, 503, etc.)
 	* @return Response A Reponse instance
 	*/
-	public function error($code = 500, $message = '')
+	public function error($message, $code = 500)
 	{
 		$this->template->assign_vars(array(
 			'MESSAGE_TEXT'	=> $message,