diff --git a/include/admin/images.inc.php b/include/admin/images.inc.php
index 8431dcc1..69d6d730 100644
--- a/include/admin/images.inc.php
+++ b/include/admin/images.inc.php
@@ -626,7 +626,7 @@ switch ($serendipity['GET']['adminAction']) {
(int)$serendipity['GET']['width'],
(int)$serendipity['GET']['height']
);
-
+ $data['extraParems'] = serendipity_generateImageSelectorParems();
$data['print_serendipity_scaleImg'] = serendipity_scaleImg($serendipity['GET']['fid'], $serendipity['GET']['width'], $serendipity['GET']['height']);
break;
@@ -636,7 +636,8 @@ switch ($serendipity['GET']['adminAction']) {
if (!is_array($file) || !serendipity_checkPermission('adminImagesDelete') || (!serendipity_checkPermission('adminImagesMaintainOthers') && $file['authorid'] != '0' && $file['authorid'] != $serendipity['authorid'])) {
return;
}
-
+
+ $data['extraParems'] = serendipity_generateImageSelectorParems("form");
$data['case_scaleSelect'] = true;
$s = getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . ($file['extension'] ? '.'. $file['extension'] : ""));
$data['img_width'] = $s[0];
@@ -727,8 +728,7 @@ if (! isset($data['showML'])) {
}
$data['get']['fid'] = $serendipity['GET']['fid']; // don't trust {$smarty.get.vars} if not proofed, as we often change GET vars via serendipty['GET'] by runtime
-$data['get']['only_path'] = $serendipity['GET']['only_path']; // we dont need other GET vars in images.inc.tpl
-
+$data['get']['only_path'] = $serendipity['GET']['only_path'];
echo serendipity_smarty_show('admin/images.inc.tpl', $data);
diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php
index 354bb22b..34209a65 100644
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -1672,7 +1672,7 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa
* Generate the url-parameters needed when generating the ML to select an image to add to the editor, to store the relevant options (like which textarea to add it to)
*
*/
-function serendipity_generateImageSelectorParems() {
+function serendipity_generateImageSelectorParems($format="url") {
global $serendipity;
$sortParams = array('perpage', 'order', 'ordermode');
@@ -1681,22 +1681,23 @@ function serendipity_generateImageSelectorParems() {
$filterParams = $serendipity['GET']['filter'] ?: array(); // ?: elvis operator, see http://en.wikipedia.org/wiki/Elvis_operator and upcoming PHP 7 ?? (isset) operator
$standaloneFilterParams = array('only_path', 'only_filename');
+ $parems = array();
foreach($importParams AS $importParam) {
if (isset($serendipity['GET'][$importParam])) {
- $extraParems .= 'serendipity[' . $importParam . ']='. serendipity_specialchars($serendipity['GET'][$importParam]) .'&';
+ $parems['serendipity[' . $importParam . ']'] = $serendipity['GET'][$importParam];
}
}
foreach($sortParams AS $sortParam) {
serendipity_restoreVar($serendipity['COOKIE']['sortorder_' . $sortParam], $serendipity['GET']['sortorder'][$sortParam]);
- $extraParems .= 'serendipity[sortorder]['. $sortParam .']='. serendipity_specialchars($serendipity['GET']['sortorder'][$sortParam]) .'&';
+ $parems['serendipity[sortorder]['. $sortParam .']'] = $serendipity['GET']['sortorder'][$sortParam];
}
foreach($standaloneFilterParams AS $filterParam) {
serendipity_restoreVar($serendipity['COOKIE'][$filterParam], $serendipity['GET'][$filterParam]);
if (!empty($serendipity['GET'][$filterParam]) && $serendipity['GET'][$filterParam] != "undefined") {
- $extraParems .= 'serendipity[' . $filterParam . ']='. serendipity_specialchars($serendipity['GET'][$filterParam]) .'&';
+ $parems['serendipity[' . $filterParam . ']'] = $serendipity['GET'][$filterParam];
}
}
@@ -1705,13 +1706,20 @@ function serendipity_generateImageSelectorParems() {
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 . ']='. serendipity_specialchars($value) .'&';
+ $parems['serendipity[filter][' . $filterParam . '][' . $key . ']'] = $value;
}
} else {
- $extraParems .= 'serendipity[filter][' . $filterParam . ']='. serendipity_specialchars($filterValue) .'&';
+ $parems['serendipity[filter][' . $filterParam . ']'] = $filterValue;
}
}
-
+ }
+
+ foreach ($parems as $param => $value) {
+ if ($format == "form") {
+ $extraParems .= '';
+ } else {
+ $extraParems .= $param.'='. serendipity_specialchars($value) .'&';
+ }
}
return $extraParems;
diff --git a/templates/2k11/admin/images.inc.tpl b/templates/2k11/admin/images.inc.tpl
index 00bcc503..c7b46dee 100644
--- a/templates/2k11/admin/images.inc.tpl
+++ b/templates/2k11/admin/images.inc.tpl
@@ -245,8 +245,7 @@
{if $print_SCALING_IMAGE} {$print_SCALING_IMAGE}{/if}
{if $print_serendipity_scaleImg} {$print_serendipity_scaleImg}{/if}
{$CONST.DONE}
-
-
+ {if $showML}{$showML}{/if}
{/if}
{if $case_scaleSelect}
{if $print_RESIZE_BLAHBLAH}{$print_RESIZE_BLAHBLAH}
{/if}
@@ -260,6 +259,7 @@
+ {$extraParems}