aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.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/functions.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/functions.php')
-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 38879caf5f..422faaa89e 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3632,7 +3632,7 @@ function obtain_users_online_string($online_users, $item_id = 0, $item = 'forum'
* @var string item Restrict online users to a certain
* session item, e.g. forum for
* session_forum_id
- * @var string sql_ary SQL query to obtain users online data
+ * @var array sql_ary SQL query array to obtain users online data
* @since 3.1.4-RC1
* @changed 3.1.7-RC1 Change sql query into array and adjust var accordingly. Allows extension authors the ability to adjust the sql_ary.
*/