Merge branch 'master' of github.com:dom-mel/dokuwiki

1 files changed, 10 insertions, 2 deletions

diff --git a/inc/media.php b/inc/media.php
index 7da1f0899..9d3e90a54 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -647,7 +647,11 @@ function media_tabs_details($image, $selected_tab = ''){
 function media_tab_files_options(){
     global $lang, $NS;
     $form = new Doku_Form(array('class' => 'options', 'method' => 'get',
-                                'action' => media_managerURL(array(), '&')));
+                                'action' => wl($ID)));
+    $media_manager_params = media_managerURL(array(), '', false, true);
+    foreach($media_manager_params as $pKey => $pVal){
+        $form->addHidden($pKey, $pVal);
+    }
     $form->addHidden('sectok', null);
     if (isset($_REQUEST['q'])) {
         $form->addHidden('q', $_REQUEST['q']);
@@ -698,7 +702,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;
     }
 }