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

fix setcookie in media library

Browse Source
This commit is contained in:
onli
2013-06-08 13:03:13 +02:00
parent ad98a01899
commit dc6a5fce29
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/functions_images.inc.php
View File

@ -1461,13 +1461,11 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa
foreach($sortParams AS $sortParam) {
serendipity_restoreVar($serendipity['COOKIE']['sortorder_' . $sortParam], $serendipity['GET']['sortorder'][$sortParam]);
serendipity_JSsetCookie('sortorder_' . $sortParam, htmlspecialchars($serendipity['GET']['sortorder'][$sortParam]));
$extraParems .= 'serendipity[sortorder]['. $sortParam .']='. htmlspecialchars($serendipity['GET']['sortorder'][$sortParam]) .'&';
}
foreach($filterParams AS $filterParam) {
serendipity_restoreVar($serendipity['COOKIE'][$filterParam], $serendipity['GET'][$filterParam]);
serendipity_JSsetCookie($filterParam, htmlspecialchars($serendipity['GET'][$filterParam]));
if (!empty($serendipity['GET'][$filterParam])) {
$extraParems .= 'serendipity[' . $filterParam . ']='. htmlspecialchars($serendipity['GET'][$filterParam]) .'&';
}
@ -2856,9 +2854,20 @@ function serendipity_showMedia(&$file, &$paths, $url = '', $manage = false, $lin
'sort_row_interval' => array(8, 16, 50, 100),
'nr_files' => count($file),
'keywords' => explode(';', $serendipity['mediaKeywords']),
'thumbSize' => $serendipity['thumbSize']
'thumbSize' => $serendipity['thumbSize'],
'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['files'] =& $file;
if (count($paths) > 0) {