aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/user_loader.php
diff options
context:
space:
mode:
authorMaat <maat-pub@mageia.biz>2020-05-09 01:15:08 +0200
committerMaat <maat-pub@mageia.biz>2020-05-09 01:15:08 +0200
commit6985226b17e8a0ef0a720bf1d12fe0c216e13dab (patch)
tree116d2565ac02c40abe0548863c6badf8ec3e1d1e /phpBB/phpbb/user_loader.php
parent8ea437e30605e0f66b5220bf904a61d7c1d11ddd (diff)
parent8d00784dfe2c8bcb10843ff70b4cfa998d703285 (diff)
downloadforums-master.tar
forums-master.tar.gz
forums-master.tar.bz2
forums-master.tar.xz
forums-master.zip
Merge remote-tracking branch 'upstream/prep-release-3.3.0'HEADmaster
Diffstat (limited to 'phpBB/phpbb/user_loader.php')
-rw-r--r--phpBB/phpbb/user_loader.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/user_loader.php b/phpBB/phpbb/user_loader.php
index 9297450f3e..3dacf07ff5 100644
--- a/phpBB/phpbb/user_loader.php
+++ b/phpBB/phpbb/user_loader.php
@@ -123,7 +123,7 @@ class user_loader
/**
* Get a user row from our users cache
*
- * @param int $user_id User ID of the user you want to retreive
+ * @param int $user_id User ID of the user you want to retrieve
* @param bool $query Should we query the database if this user has not yet been loaded?
* Typically this should be left as false and you should make sure
* you load users ahead of time with load_users()
@@ -150,7 +150,7 @@ class user_loader
/**
* Get username
*
- * @param int $user_id User ID of the user you want to retreive the username for
+ * @param int $user_id User ID of the user you want to retrieve the username for
* @param string $mode The mode to load (same as get_username_string). One of the following:
* profile (for getting an url to the profile)
* username (for obtaining the username)
@@ -204,7 +204,7 @@ class user_loader
/**
* Get rank
*
- * @param int $user_id User ID of the user you want to retreive the rank for
+ * @param int $user_id User ID of the user you want to retrieve the rank for
* @param bool $query Should we query the database if this user has not yet been loaded?
* Typically this should be left as false and you should make sure
* you load users ahead of time with load_users()