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

Save filters when browsing ML (#208)

Browse Source 
Was broken for the simplified filter
This commit is contained in:
onli
2014-08-30 00:22:45 +02:00
parent bc6561eeb5
commit 7a56b89beb
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/functions_images.inc.php
View File

@ -1668,7 +1668,8 @@ function serendipity_generateImageSelectorParems() {
$sortParams = array('perpage', 'order', 'ordermode');
$importParams = array('adminModule', 'htmltarget', 'filename_only', 'textarea', 'subpage', 'keywords', 'noBanner', 'noSidebar', 'noFooter', 'showUpload','showMediaToolbar');
$extraParems = '';
$filterParams = array('only_path', 'only_filename');
$standaloneFilterParams = array('only_path', 'only_filename');
$filterParams = $serendipity['GET']['filter'];
foreach($importParams AS $importParam) {
if (isset($serendipity['GET'][$importParam])) {
@ -1681,12 +1682,27 @@ function serendipity_generateImageSelectorParems() {
$extraParems .= 'serendipity[sortorder]['. $sortParam .']='. htmlspecialchars($serendipity['GET']['sortorder'][$sortParam]) .'&';
}
foreach($filterParams AS $filterParam) {
foreach($standaloneFilterParams AS $filterParam) {
serendipity_restoreVar($serendipity['COOKIE'][$filterParam], $serendipity['GET'][$filterParam]);
if (!empty($serendipity['GET'][$filterParam]) && $serendipity['GET'][$filterParam] != "undefined") {
$extraParems .= 'serendipity[' . $filterParam . ']='. htmlspecialchars($serendipity['GET'][$filterParam]) .'&';
}
}
foreach($filterParams AS $filterParam => $filterValue) {
serendipity_restoreVar($serendipity['COOKIE']['filter'][$filterParam], $serendipity['GET']['filter'][$filterParam]);
if (!empty($serendipity['GET']['filter'][$filterParam]) && $serendipity['GET']['filter'][$filterParam] != "undefined") {
if (is_array($filterValue)) {
foreach($filterValue as $key => $value) {
$extraParems .= 'serendipity[filter][' . $filterParam . '][' . $key . ']='. htmlspecialchars($value) .'&';
}
} else {
$extraParems .= 'serendipity[filter][' . $filterParam . ']='. htmlspecialchars($filterValue) .'&';
}
}
}
return $extraParems;
}
@ -1993,7 +2009,6 @@ function serendipity_getImageFields() {
);
} else {
$x = array(
'i.date' => array('desc' => SORT_ORDER_DATE,
'type' => 'date'