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

cleanup and note once

Browse Source
This commit is contained in:
Ian
2015-01-20 15:13:53 +01:00
parent 2efc58c03d
commit 9418f806d3
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/functions_images.inc.php
View File

@ -1669,16 +1669,18 @@ 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 textare to add it to) * 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() {
global $serendipity; global $serendipity;
$sortParams = array('perpage', 'order', 'ordermode'); $sortParams = array('perpage', 'order', 'ordermode');
$importParams = array('adminModule', 'htmltarget', 'filename_only', 'textarea', 'subpage', 'keywords', 'noBanner', 'noSidebar', 'noFooter', 'showUpload','showMediaToolbar'); $importParams = array('adminModule', 'htmltarget', 'filename_only', 'textarea', 'subpage', 'keywords', 'noBanner', 'noSidebar', 'noFooter', 'showUpload','showMediaToolbar');
$extraParems = ''; $extraParems = '';
$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'); $standaloneFilterParams = array('only_path', 'only_filename');
$filterParams = $serendipity['GET']['filter'] ?: array();
foreach($importParams AS $importParam) { foreach($importParams AS $importParam) {
if (isset($serendipity['GET'][$importParam])) { if (isset($serendipity['GET'][$importParam])) {