mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

fix media.filter and media.sortorder param

Browse Source
This commit is contained in:
Ian
2015-10-28 11:55:46 +01:00
parent f2f4855ed7
commit 1965d2d419
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/functions_images.inc.php
View File

@ -2945,19 +2945,9 @@ function serendipity_showMedia(&$file, &$paths, $url = '', $manage = false, $lin
'nr_files' => count($file), 'nr_files' => count($file),
'keywords' => explode(';', $serendipity['mediaKeywords']), 'keywords' => explode(';', $serendipity['mediaKeywords']),
'thumbSize' => $serendipity['thumbSize'], 'thumbSize' => $serendipity['thumbSize'],
'sortParams' => array('perpage', 'order', 'ordermode'), 'sortParams' => array('perpage', 'order', 'ordermode')
'filterParams' => array('only_path', 'only_filename')
); );
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 = array_merge($media, $smarty_vars);
$media['files'] =& $file; $media['files'] =& $file;

6
templates/2k11/admin/media_pane.tpl
View File

@ -162,22 +162,20 @@
</select> </select>
</div> </div>
</div> </div>
<div class="form_buttons"> <div class="form_buttons">
<input name="go" type="submit" value="{$CONST.GO}"> <input name="go" type="submit" value="{$CONST.GO}">
</div> </div>
</fieldset> </fieldset>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
// alert(serendipity.GetCookie('serendipity[only_path]'));
// write: is plain "foo", read: is "serendipity[foo]"! // write: is plain "foo", read: is "serendipity[foo]"!
{foreach $media.sortParams AS $sortParam} {foreach $media.sortParams AS $sortParam}
serendipity.SetCookie("sortorder_{$sortParam}","{$get_sortorder_{$sortParam}}"); serendipity.SetCookie("sortorder_{$sortParam}","{$media.sortorder.{$sortParam}}");
{/foreach} {/foreach}
{foreach $media.filterParams AS $filterParam} {foreach $media.filterParams AS $filterParam}
serendipity.SetCookie("{$filterParam}", "{$get_{$filterParam}}"); serendipity.SetCookie("{$filterParam}", "{$media.{$filterParam}}");
{/foreach} {/foreach}
serendipity.SetCookie("serendipity_toggle_dir", "{$media.toggle_dir}"); serendipity.SetCookie("serendipity_toggle_dir", "{$media.toggle_dir}");