diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2014-09-26 11:31:13 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2014-09-26 11:31:13 +0200 |
| commit | 7b950f2d59050052c1d9251b0bd9bd40c7441040 (patch) | |
| tree | 98a14f7a197ed87059aab12b3c2a424000962a43 /inc/common.php | |
| parent | 9d209ab87700c872fa85dcbee8623ad386190847 (diff) | |
| parent | 2dc9e90007f12ac996b0e74479137a9dc6243c3c (diff) | |
| download | rpg-7b950f2d59050052c1d9251b0bd9bd40c7441040.tar.gz rpg-7b950f2d59050052c1d9251b0bd9bd40c7441040.tar.bz2 | |
Merge remote-tracking branch 'origin/auth_getUserData_improvements'
* origin/auth_getUserData_improvements:
KISS - remove class constants for REQUIRE_GROUPS & IGNORE_GROUPS and replace with boolean values
use $requireGroups constants in auth classes; comments; code improvements
fix comment errors, sp. & grammar
code styling - add missing braces
Allow user info to be retrieved without groups
Restore correct public interface of getUserData() for authldap plugin
Conflicts:
inc/common.php
Diffstat (limited to 'inc/common.php')
| -rw-r--r-- | inc/common.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/common.php b/inc/common.php index 503155c46..e56285f62 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1583,7 +1583,7 @@ function shorten($keep, $short, $max, $min = 9, $char = '…') { } /** - * Return the users realname or e-mail address for use + * Return the users real name or e-mail address for use * in page footer and recent changes pages * * @param string|null $username or null when currently logged-in user should be used |