diff options
| author | rvelices <rv-github@modusoptimus.com> | 2006-02-23 05:12:32 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2006-02-23 05:12:32 +0000 |
| commit | 347d2e34b3972ec1d0022b831dd5a1fe13adbaa5 (patch) | |
| tree | 92cd6cd3e49c50337de07c175c2d9d71291a74f0 /include/user.inc.php | |
| parent | 34538a62f4ac8bc6db41580058fdd040abaa3183 (diff) | |
fix: permissioning not working (2 bugs)
fix: locked gallery cannot be unlocked (impossible to login)
improvement: nicer display in redirect.tpl
improvement: when a page is not accessible because of permissions (accessed
through bookmark or email), redirect to identification.php and after
identification to the initially requested page
git-svn-id: http://piwigo.org/svn/trunk@1052 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | include/user.inc.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/user.inc.php b/include/user.inc.php index c22f4b369..4b3dd13e8 100644 --- a/include/user.inc.php +++ b/include/user.inc.php @@ -58,12 +58,11 @@ if ($conf['apache_authentication'] and isset($_SERVER['REMOTE_USER'])) $user['is_the_guest'] = false; } - $user = array_merge( $user, getuserdata( $user['id'], - defined('IN_ADMIN') and IN_ADMIN ? false : true // use cache ? + ( defined('IN_ADMIN') and IN_ADMIN ) ? false : true // use cache ? ) ); |