remove trailing ampersand
plus minors in prep for bulkmove / rename enhancement
This commit is contained in:
@ -1652,6 +1652,7 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa
|
|||||||
'extraParems' => $extraParems,
|
'extraParems' => $extraParems,
|
||||||
'totalImages' => $totalImages
|
'totalImages' => $totalImages
|
||||||
));
|
));
|
||||||
|
|
||||||
return serendipity_showMedia(
|
return serendipity_showMedia(
|
||||||
$serendipity['imageList'],
|
$serendipity['imageList'],
|
||||||
$paths,
|
$paths,
|
||||||
@ -1719,7 +1720,7 @@ function serendipity_generateImageSelectorParems($format = 'url') {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $extraParems;
|
return rtrim($extraParems, '&');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -3430,6 +3431,7 @@ function serendipity_moveMediaDirectory($oldDir, $newDir, $type = 'dir', $item_i
|
|||||||
|
|
||||||
if ($type == 'file') {
|
if ($type == 'file') {
|
||||||
|
|
||||||
|
// active in mean of eval or executable
|
||||||
if (serendipity_isActiveFile(basename($newDir))) {
|
if (serendipity_isActiveFile(basename($newDir))) {
|
||||||
echo '<span class="msg_error"><span class="icon-attention-circled"></span> ';
|
echo '<span class="msg_error"><span class="icon-attention-circled"></span> ';
|
||||||
printf(ERROR_FILE_FORBIDDEN, serendipity_specialchars($newDir));
|
printf(ERROR_FILE_FORBIDDEN, serendipity_specialchars($newDir));
|
||||||
|
Reference in New Issue
Block a user