aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-01-04 12:21:28 +0100
committerMarc Alexander <admin@m-a-styles.de>2015-01-04 12:21:28 +0100
commit3aad3f0b3f4ba479e77d5c2819db6ebbb0a40325 (patch)
tree0f9495c8407c6ddc839cb9614dfaa018694657d9
parent7b84b8bba871c0405e85090a3d42b1609d1bcd9b (diff)
parent3638b2ff645fe1490810e603a6d1afdad30cd3c0 (diff)
downloadforums-3aad3f0b3f4ba479e77d5c2819db6ebbb0a40325.tar
forums-3aad3f0b3f4ba479e77d5c2819db6ebbb0a40325.tar.gz
forums-3aad3f0b3f4ba479e77d5c2819db6ebbb0a40325.tar.bz2
forums-3aad3f0b3f4ba479e77d5c2819db6ebbb0a40325.tar.xz
forums-3aad3f0b3f4ba479e77d5c2819db6ebbb0a40325.zip
Merge branch 'develop-ascraeus' into develop
-rw-r--r--phpBB/includes/functions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 81e296e9c9..a016f8e62a 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2931,7 +2931,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
* @var string username User name used to login
* @var string password Password used to login
* @var string err Error message
- * @since 3.1.3
+ * @since 3.1.3-RC1
*/
$vars = array('result', 'username', 'password', 'err');
extract($phpbb_dispatcher->trigger_event('core.login_box_failed', compact($vars)));