summaryrefslogtreecommitdiff
path: root/inc/pageutils.php
diff options
context:
space:
mode:
authorGuy Brand <gb@unistra.fr>2013-05-10 14:35:28 +0200
committerGuy Brand <gb@unistra.fr>2013-05-10 14:35:28 +0200
commit83f133d10eda8c1c6b6429c08b2d0722ca88ca17 (patch)
tree0377662d2335a0e2160175d5be3b95a92f6bb332 /inc/pageutils.php
parentbc250e0ee2ec4fba891b53aa4f1814ce648ac71a (diff)
parent2a5a1456564635ddbca06edbc902e7f820d2a97b (diff)
downloadrpg-83f133d10eda8c1c6b6429c08b2d0722ca88ca17.tar.gz
rpg-83f133d10eda8c1c6b6429c08b2d0722ca88ca17.tar.bz2
Merge branch master into stable
Diffstat (limited to 'inc/pageutils.php')
-rw-r--r--inc/pageutils.php3
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);