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

Issue #437

Browse Source
This commit is contained in:
Garvin Hicking 2017-01-26 08:25:06 +01:00
parent 97277cfd1a
commit 2b5de12b38
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/NEWS
View File

@ -1,6 +1,9 @@
Version 2.1-rc1 (January, 26th 2017)
------------------------------------------------------------------------
* Fix issue #437 - Remove the hardcoded media filter only_filename
input field and re-allow the $order_fields['i.name'].
* Issue #430, fix proper name of new feedShowMail configuration var
in rss.php for showing mail addresses

2
include/functions_images.inc.php
View File

@ -2925,7 +2925,7 @@ function serendipity_showMedia(&$file, &$paths, $url = '', $manage = false, $lin
}
$order_fields = serendipity_getImageFields();
// reset filename for building template filters, since this is hardcoded as 'only_filename'
unset($order_fields['i.name']);
#unset($order_fields['i.name']);
$media = array(
'manage' => $manage,

5
templates/2k11/admin/media_pane.tpl
View File

@ -112,11 +112,6 @@
{/if}
{/foreach}
<div id="media_filter_file" class="form_field {if $media.simpleFilters}center{else}left{/if}">
<label for="serendipity_only_filename">{$CONST.SORT_ORDER_NAME}</label>
<input id="serendipity_only_filename" name="serendipity[only_filename]" type="text" value="{$media.only_filename|escape}">
</div>
<div id="media_filter_keywords" class="form_field {if $media.simpleFilters}right{else}center{/if}">
<label for="keyword_input">{$CONST.MEDIA_KEYWORDS}</label>
<input id="keyword_input" name="serendipity[keywords]" type="text" value="{$media.keywords_selected|escape}">