Fix links in ML not going to item when no image.

Cherry-picked from master branch.
This commit is contained in:
onli 2019-11-02 21:32:24 +01:00 committed by Thomas Hochstein
parent 89351eb77b
commit 5934de7a4e
2 changed files with 4 additions and 4 deletions

View File

@ -10,6 +10,9 @@ Version 2.3.3-beta1 ()
published blog entries and ability to prepend a mail body. published blog entries and ability to prepend a mail body.
Also fixes missing "keep strip tags" configuration option Also fixes missing "keep strip tags" configuration option
* Fix: Items in Medialibrary that are not images now get
the correct link
* #651: When using checkboxes to insert multiple media files, if only * #651: When using checkboxes to insert multiple media files, if only
one asset has been selected, do not use the gallery mode, one asset has been selected, do not use the gallery mode,
but instead single-asset view. Also improves to click the title but instead single-asset view. Also improves to click the title

View File

@ -55,10 +55,7 @@
{$img_alt="{$file.mime}"} {$img_alt="{$file.mime}"}
{/if} {/if}
{/if} {/if}
{* builds a ML objects link for step 1, to pass to media_choose.tpl file section: passthrough media.filename_only scripts - do not use "empty($link) AND" here, since that would require a reset before! *}
{if (!$file.is_image OR $file.is_image == 0) AND $file.mediatype != 'image' AND $file.realfile}
{$link="?serendipity[adminModule]=images&serendipity[adminAction]=choose&serendipity[noBanner]=true&serendipity[noSidebar]=true&serendipity[noFooter]=true&serendipity[fid]={$file.id}&serendipity[filename_only]={$media.filename_only}&serendipity[textarea]={$media.textarea}&serendipity[htmltarget]={$media.htmltarget}"}
{/if}
<article id="media_{$file.id}" class="media_file {if $media.manage AND $media.multiperm}manage {/if}{cycle values="odd,even"}"> <article id="media_{$file.id}" class="media_file {if $media.manage AND $media.multiperm}manage {/if}{cycle values="odd,even"}">
<header class="clearfix"> <header class="clearfix">