aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_bbcodes.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-01-16 23:10:37 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-01-16 23:10:37 +0100
commit8e5b5a5c07863f3ea36a5b506bd7a5ebf277415b (patch)
tree7125d8fd006fb4add00519fd186b2b5fd220494c /phpBB/includes/acp/acp_bbcodes.php
parent8e584dfa6b139fb415e6c18e5daf8fe8f323a5ce (diff)
parentf34df97f8b8a6ae8ade4eeee6efc2bf4faf64e91 (diff)
downloadforums-8e5b5a5c07863f3ea36a5b506bd7a5ebf277415b.tar
forums-8e5b5a5c07863f3ea36a5b506bd7a5ebf277415b.tar.gz
forums-8e5b5a5c07863f3ea36a5b506bd7a5ebf277415b.tar.bz2
forums-8e5b5a5c07863f3ea36a5b506bd7a5ebf277415b.tar.xz
forums-8e5b5a5c07863f3ea36a5b506bd7a5ebf277415b.zip
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/includes/acp/acp_bbcodes.php')
-rw-r--r--phpBB/includes/acp/acp_bbcodes.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index dab18289c7..f958ae93c7 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -373,7 +373,7 @@ class acp_bbcodes
*
* @event core.acp_bbcodes_display_form
* @var string action Type of the action: modify|create
- * @var string sql_ary The SQL array to get custom bbcode data
+ * @var array sql_ary The SQL array to get custom bbcode data
* @var array template_data Array with form template data
* @var string u_action The u_action link
* @since 3.1.0-a3