diff options
| author | Hakan Sandell <sandell.hakan@gmail.com> | 2010-11-20 14:30:57 +0100 |
|---|---|---|
| committer | Hakan Sandell <sandell.hakan@gmail.com> | 2010-11-20 14:30:57 +0100 |
| commit | 8f0a521756228d15469d2a712fa1010b64a1d53a (patch) | |
| tree | 38ce28a99433403fa18d2bce871abc7290c8be54 /inc/template.php | |
| parent | ba9418bca378a6759305e3b388926df4f5a0af9c (diff) | |
| parent | 85dcda20ffd82becbe69a7ca5d99e4b6fd99c9ea (diff) | |
| download | rpg-8f0a521756228d15469d2a712fa1010b64a1d53a.tar.gz rpg-8f0a521756228d15469d2a712fa1010b64a1d53a.tar.bz2 | |
Merge branch 'master' of git://github.com/splitbrain/dokuwiki
Diffstat (limited to 'inc/template.php')
| -rw-r--r-- | inc/template.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/template.php b/inc/template.php index 00bfde723..e2ea6e386 100644 --- a/inc/template.php +++ b/inc/template.php @@ -609,7 +609,7 @@ function tpl_get_action($type) { $type = 'subscribe'; $params['do'] = 'subscribe'; case 'subscribe': - if(!$conf['useacl'] || !$auth || $ACT !== 'show' || !$conf['subscribers'] || !$_SERVER['REMOTE_USER']){ + if(!$conf['useacl'] || !$auth || !$conf['subscribers'] || !$_SERVER['REMOTE_USER']){ return false; } break; @@ -617,7 +617,7 @@ function tpl_get_action($type) { break; case 'profile': if(!$conf['useacl'] || !$auth || !isset($_SERVER['REMOTE_USER']) || - !$auth->canDo('Profile') || ($ACT=='profile')){ + !$auth->canDo('Profile')){ return false; } break; |