aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-06-20 22:46:23 +0200
committerAndreas Fischer <bantu@phpbb.com>2010-06-20 22:46:23 +0200
commitb7ae0fe4e91be1f7dc1d38d2c3c1e5b043d95739 (patch)
tree0e270ffcf52b264abde516dc74b59610c3d0b050 /phpBB
parent352c69f7b2146e8f0b42689530b61f687b917c51 (diff)
parent46cae83264905a25e47355dfb7923df2d9ec252f (diff)
downloadforums-b7ae0fe4e91be1f7dc1d38d2c3c1e5b043d95739.tar
forums-b7ae0fe4e91be1f7dc1d38d2c3c1e5b043d95739.tar.gz
forums-b7ae0fe4e91be1f7dc1d38d2c3c1e5b043d95739.tar.bz2
forums-b7ae0fe4e91be1f7dc1d38d2c3c1e5b043d95739.tar.xz
forums-b7ae0fe4e91be1f7dc1d38d2c3c1e5b043d95739.zip
Merge branch 'ticket/bantu/9655' into develop-olympus
* ticket/bantu/9655: [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/acp/acp_captcha.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php
index 56a57e319c..1893eed14f 100644
--- a/phpBB/includes/acp/acp_captcha.php
+++ b/phpBB/includes/acp/acp_captcha.php
@@ -89,14 +89,14 @@ class acp_captcha
}
else
{
- trigger_error($user->lang['CAPTCHA_UNAVAILABLE'] . adm_back_link($this->u_action));
+ trigger_error($user->lang['CAPTCHA_UNAVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING);
}
}
trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action));
}
else if ($submit)
{
- trigger_error($user->lang['FORM_INVALID'] . adm_back_link());
+ trigger_error($user->lang['FORM_INVALID'] . adm_back_link(), E_USER_WARNING);
}
else
{