diff --git a/docs/NEWS b/docs/NEWS index b0b5ddd7..b0399ec0 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -4,17 +4,19 @@ Version 1.7 () ------------------------------------------------------------------------ - * Allow Smarty to fetch .tpl files from all directories so that - s9y plugin can use the fetch() call for their .tpl files no - matter which (symlinked) directory the plugin resides in. - The Smarty security policy to us only serves as a restriction - within .tpl files to not allow arbitrary PHP modifier/function calls. - If in the future Smarty supports enforcing trustedDir checks on - {include} calls seperately to smarty->fetch() calls, we'll also - add that to .tpl files. - (garvinhicking) + * fixed draft & future entries preview link in backend + + * Allow Smarty to fetch .tpl files from all directories so that + s9y plugin can use the fetch() call for their .tpl files no + matter which (symlinked) directory the plugin resides in. + The Smarty security policy to us only serves as a restriction + within .tpl files to not allow arbitrary PHP modifier/function calls. + If in the future Smarty supports enforcing trustedDir checks on + {include} calls seperately to smarty->fetch() calls, we'll also + add that to .tpl files. + (garvinhicking) - * Patch by Markus Brükner: Properly handle files that have no + * Patch by Markus Brükner: Properly handle files that have no extension in media database * Made Spartacus recognize github.com mirror (garvinhicking) diff --git a/include/admin/entries.inc.php b/include/admin/entries.inc.php index f0f04acd..b42e1379 100644 --- a/include/admin/entries.inc.php +++ b/include/admin/entries.inc.php @@ -284,7 +284,7 @@ function serendipity_drawList() { </td> <td align="right"> <?php if (serendipity_db_bool($entry['isdraft']) || (!$serendipity['showFutureEntries'] && $entry['timestamp'] >= serendipity_serverOffsetHour())) { ?> - <a target="_blank" href="<?php echo $entry['preview_link']; ?>" title="<?php echo PREVIEW . ' #' . $entry['id']; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png'); ?>" alt="<?php echo PREVIEW; ?>" /><?php echo PREVIEW ?></a> + <a target="_blank" href="<?php echo $entry['preview_link']; ?>&<?php echo serendipity_setFormToken('url'); ?>" title="<?php echo PREVIEW . ' #' . $entry['id']; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png'); ?>" alt="<?php echo PREVIEW; ?>" /><?php echo PREVIEW ?></a> <?php } else { ?> <a target="_blank" href="<?php echo $entry['link']; ?>" title="<?php echo VIEW . ' #' . $entry['id']; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png'); ?>" alt="<?php echo VIEW; ?>" /><?php echo VIEW ?></a> <?php } ?>