diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2013-07-30 10:50:52 +0200 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2013-07-30 10:50:52 +0200 |
| commit | af07997c5ff7cc096965159d90158e3710d2d019 (patch) | |
| tree | defaf770e77a679436eb56291185905b547640d0 /inc/pageutils.php | |
| parent | bdac741579f8c6f00248d5d3ec635d4c2e08fb1e (diff) | |
| parent | 7d8a6abbb21979fd77dca10275ebb8e01a04b6e4 (diff) | |
| download | rpg-af07997c5ff7cc096965159d90158e3710d2d019.tar.gz rpg-af07997c5ff7cc096965159d90158e3710d2d019.tar.bz2 | |
Merge branch 'master' into configmgr_improvements
Conflicts:
inc/auth.php
inc/template.php
lib/plugins/authad/lang/zh/settings.php
lib/plugins/authldap/lang/en/settings.php
lib/plugins/authldap/lang/zh/settings.php
lib/plugins/authmysql/lang/zh/settings.php
lib/plugins/config/settings/config.class.php
lib/plugins/usermanager/admin.php
Diffstat (limited to 'inc/pageutils.php')
| -rw-r--r-- | inc/pageutils.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/inc/pageutils.php b/inc/pageutils.php index ca4936a82..5043d2263 100644 --- a/inc/pageutils.php +++ b/inc/pageutils.php @@ -21,6 +21,7 @@ function getID($param='id',$clean=true){ global $INPUT; global $conf; + global $ACT; $id = $INPUT->str($param); @@ -75,7 +76,7 @@ function getID($param='id',$clean=true){ // fall back to default $id = $id.$conf['start']; } - send_redirect(wl($id,'',true)); + if (isset($ACT) && $ACT === 'show') send_redirect(wl($id,'',true)); } if($clean) $id = cleanID($id); |