From 1965d2d4199dbb6ac164400a89e01202533d6911 Mon Sep 17 00:00:00 2001
From: Ian <aristophian@googlemail.com>
Date: Wed, 28 Oct 2015 11:55:46 +0100
Subject: [PATCH] fix media.filter and media.sortorder param

---
 include/functions_images.inc.php    | 12 +-----------
 templates/2k11/admin/media_pane.tpl |  6 ++----
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php
index 8bbf5b16..d9558154 100644
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -2945,19 +2945,9 @@ function serendipity_showMedia(&$file, &$paths, $url = '', $manage = false, $lin
         'nr_files'          => count($file),
         'keywords'          => explode(';', $serendipity['mediaKeywords']),
         'thumbSize'         => $serendipity['thumbSize'],
-        'sortParams'        => array('perpage', 'order', 'ordermode'),
-        'filterParams'      => array('only_path', 'only_filename')
+        'sortParams'        => array('perpage', 'order', 'ordermode')
     );
 
-
-    foreach($media['sortParams'] AS $sortParam) {
-        $serendipity['smarty']->assign(array("get_sortorder_$sortParam" => $serendipity['GET']['sortorder'][$sortParam]));
-    }
-
-    foreach($media['filterParams'] AS $filterParam) {
-        $serendipity['smarty']->assign(array("$filterParam" => $serendipity['GET'][$filterParam]));
-    }
-
     $media = array_merge($media, $smarty_vars);
     $media['files'] =& $file;
 
diff --git a/templates/2k11/admin/media_pane.tpl b/templates/2k11/admin/media_pane.tpl
index d197041b..e8e25d1f 100644
--- a/templates/2k11/admin/media_pane.tpl
+++ b/templates/2k11/admin/media_pane.tpl
@@ -162,22 +162,20 @@
                     </select>
                 </div>
             </div>
-
             <div class="form_buttons">
                 <input name="go" type="submit" value="{$CONST.GO}">
             </div>
         </fieldset>
         <script>
             $(document).ready(function() {
-                // alert(serendipity.GetCookie('serendipity[only_path]'));
                 // write: is plain "foo", read: is "serendipity[foo]"!
             {foreach $media.sortParams AS $sortParam}
 
-                serendipity.SetCookie("sortorder_{$sortParam}","{$get_sortorder_{$sortParam}}");
+                serendipity.SetCookie("sortorder_{$sortParam}","{$media.sortorder.{$sortParam}}");
             {/foreach}
             {foreach $media.filterParams AS $filterParam}
 
-                serendipity.SetCookie("{$filterParam}", "{$get_{$filterParam}}");
+                serendipity.SetCookie("{$filterParam}", "{$media.{$filterParam}}");
             {/foreach}
 
                 serendipity.SetCookie("serendipity_toggle_dir", "{$media.toggle_dir}");