Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

This commit is contained in:
Garvin Hicking 2015-01-15 15:39:17 +01:00
commit a8e61fe115

View File

@ -95,7 +95,7 @@
{if !$showFutureEntries && ($entry.timestamp >= $serverOffsetHour) && $entry.isdraft == "false"}
<span class="entry_status status_future" title="{$CONST.SCHEDULED}: {$CONST.ENTRY_PUBLISHED_FUTURE}">{$entry.timestamp|@formatTime:$CONST.DATE_FORMAT_SHORT}</span>
{/if}
{if $entry.ep_is_sticky}
{if $entry.properties.ep_is_sticky}
<span class="entry_status status_sticky">{$CONST.STICKY_POSTINGS}</span>
{/if}
{if $entry.isdraft == "true"}