summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Lang <mail@adrianlang.de>2011-10-30 10:50:40 +0100
committerAdrian Lang <mail@adrianlang.de>2011-10-30 10:51:14 +0100
commit3629bc8cec45352566fcad4764203908c2b22528 (patch)
tree22baa529a5bfad22c18ac8ef16ec5382a9592712
parent1888d1bb1d60876eb3334724dce2e41eadb83efa (diff)
downloadrpg-3629bc8cec45352566fcad4764203908c2b22528.tar.gz
rpg-3629bc8cec45352566fcad4764203908c2b22528.tar.bz2
MediaManager: Check DOKU_PREF cookie value for validness
-rw-r--r--inc/media.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/inc/media.php b/inc/media.php
index 7da1f0899..dab0bcef2 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -698,7 +698,11 @@ function _media_get_display_param($param, $values) {
// FIXME: Set cookie
return $_REQUEST[$param];
} else {
- return get_doku_pref($param, $values['default']);
+ $val = get_doku_pref($param, $values['default']);
+ if (!in_array($val, $values)) {
+ $val = $values['default'];
+ }
+ return $val;
}
}