diff options
| author | Hakan Sandell <sandell.hakan@gmail.com> | 2011-10-30 12:41:26 +0100 |
|---|---|---|
| committer | Hakan Sandell <sandell.hakan@gmail.com> | 2011-10-30 12:41:26 +0100 |
| commit | 3a68d3cc23ddbed6aed2eea5ef49c35ad3494959 (patch) | |
| tree | 4857df2cb1547ba330cf664bda9882615ace0db8 /inc/media.php | |
| parent | ed993c3be49e5048c5a8582d94415a1e74e9ec00 (diff) | |
| parent | d5a9514cb7286254b1dcf65ba764234e199b8b7f (diff) | |
| download | rpg-3a68d3cc23ddbed6aed2eea5ef49c35ad3494959.tar.gz rpg-3a68d3cc23ddbed6aed2eea5ef49c35ad3494959.tar.bz2 | |
Merge branch 'master' of github.com:splitbrain/dokuwiki
Diffstat (limited to 'inc/media.php')
| -rw-r--r-- | inc/media.php | 6 |
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; } } |