diff options
author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-09-01 17:50:24 +0200 |
---|---|---|
committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-09-01 17:50:24 +0200 |
commit | 65833968962f86342542bf9d52f9cdcb7f595379 (patch) | |
tree | 47d71f8f8f5298327d27047e5ce7d08d645d2908 /inc | |
parent | 22db8df7a2f043e38437a49bb327354b2a296bf0 (diff) | |
download | rpg-65833968962f86342542bf9d52f9cdcb7f595379.tar.gz rpg-65833968962f86342542bf9d52f9cdcb7f595379.tar.bz2 |
fix userlink title when no authplugin is available or no user is found
Diffstat (limited to 'inc')
-rw-r--r-- | inc/common.php | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/inc/common.php b/inc/common.php index 8c9956018..503155c46 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1641,22 +1641,20 @@ function userlink($username = null, $textonly = false) { $evt = new Doku_Event('COMMON_USER_LINK', $data); if($evt->advise_before(true)) { if(empty($data['name'])) { - if($conf['showuseras'] == 'loginname') { - $data['name'] = $textonly ? $data['username'] : hsc($data['username']); - } else { - if($auth) $info = $auth->getUserData($username); - if(isset($info) && $info) { - switch($conf['showuseras']) { - case 'username': - case 'username_link': - $data['name'] = $textonly ? $info['name'] : hsc($info['name']); - break; - case 'email': - case 'email_link': - $data['name'] = obfuscate($info['mail']); - break; - } + if($auth) $info = $auth->getUserData($username); + if($conf['showuseras'] != 'loginname' && isset($info) && $info) { + switch($conf['showuseras']) { + case 'username': + case 'username_link': + $data['name'] = $textonly ? $info['name'] : hsc($info['name']); + break; + case 'email': + case 'email_link': + $data['name'] = obfuscate($info['mail']); + break; } + } else { + $data['name'] = $textonly ? $data['username'] : hsc($data['username']); } } |