aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/controller
diff options
context:
space:
mode:
authorDavid King <imkingdavid@gmail.com>2012-11-16 10:38:40 -0500
committerDavid King <imkingdavid@gmail.com>2012-11-16 17:06:00 -0500
commit1952a4f276930edd16ca51fd690ed3e7965071da (patch)
treeea7ada810a5a67fb114a4d1aea6a66528d5858c1 /phpBB/includes/controller
parentd41b1146e8947919ed9bdd41e6a30ad15e91d262 (diff)
downloadforums-1952a4f276930edd16ca51fd690ed3e7965071da.tar
forums-1952a4f276930edd16ca51fd690ed3e7965071da.tar.gz
forums-1952a4f276930edd16ca51fd690ed3e7965071da.tar.bz2
forums-1952a4f276930edd16ca51fd690ed3e7965071da.tar.xz
forums-1952a4f276930edd16ca51fd690ed3e7965071da.zip
[feature/controller] Flip method parameters, require $message
PHPBB3-10864
Diffstat (limited to 'phpBB/includes/controller')
-rw-r--r--phpBB/includes/controller/helper.php4
1 files 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,