aboutsummaryrefslogtreecommitdiff
path: root/app/views/index/normal.phtml
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-10-22 13:52:20 +0200
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-10-22 13:52:20 +0200
commitf1f9b2f5ff60f6dca05fad831b766ea7d63ff3a3 (patch)
tree9f764ec6b7be91554e1ae20323a55c1f1d2be992 /app/views/index/normal.phtml
parentb446a510ebacddd1437d907e795c83b3d05a9b98 (diff)
Entries are loaded again! It's working :)
See https://github.com/marienfressinaud/FreshRSS/issues/634
Diffstat (limited to 'app/views/index/normal.phtml')
-rw-r--r--app/views/index/normal.phtml8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index c39dba0a9..36adef2f2 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -32,14 +32,14 @@ if (!empty($this->entries)) {
<div id="stream" class="normal<?php echo $hidePosts ? ' hide_posts' : ''; ?>"><?php
?><div id="new-article">
- <a href="<?php echo Minz_Url::display($this->url); ?>"><?php echo _t('new_article'); ?></a>
+ <a href="<?php echo Minz_Url::display(Minz_Request::currentRequest()); ?>"><?php echo _t('new_article'); ?></a>
</div><?php
foreach ($this->entries as $item) {
if ($display_today && $item->isDay(FreshRSS_Days::TODAY, $today)) {
?><div class="day" id="day_today"><?php
echo _t('today');
?><span class="date"> — <?php echo timestamptodate(time(), false); ?></span><?php
- ?><span class="name"><?php echo $this->currentName; ?></span><?php
+ ?><span class="name"><?php echo FreshRSS_Context::$name; ?></span><?php
?></div><?php
$display_today = false;
}
@@ -47,14 +47,14 @@ if (!empty($this->entries)) {
?><div class="day" id="day_yesterday"><?php
echo _t('yesterday');
?><span class="date"> — <?php echo timestamptodate(time() - 86400, false); ?></span><?php
- ?><span class="name"><?php echo $this->currentName; ?></span><?php
+ ?><span class="name"><?php echo FreshRSS_Context::$name; ?></span><?php
?></div><?php
$display_yesterday = false;
}
if ($display_others && $item->isDay(FreshRSS_Days::BEFORE_YESTERDAY, $today)) {
?><div class="day" id="day_before_yesterday"><?php
echo _t('before_yesterday');
- ?><span class="name"><?php echo $this->currentName; ?></span><?php
+ ?><span class="name"><?php echo FreshRSS_Context::$name; ?></span><?php
?></div><?php
$display_others = false;
}