mark read and go to next now in the right direction

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 18e1d0511a85a7d151633b2ae83216d81963aabf..c6c91c4a631e2622b783f922af56d135ab0438ed 100755 (executable)
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -315,7 +315,7 @@ class Poche
                 }
                 break;
             case 'archive_and_next' :
-                $nextid = $this->store->getNextArticle($id, $this->user->getId());
+                $nextid = $this->store->getPreviousArticle($id, $this->user->getId());
                 $this->store->archiveById($id, $this->user->getId());
                 Tools::logm('archive link #' . $id);
                 Tools::redirect('?view=view&id=' . $nextid);

diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig
index 12024cdc066b7e262156ba283a4a030500943d1b..a57d1771b58de72d8c7fbe20835363358d7b73c4 100755 (executable)
--- a/themes/baggy/view.twig
+++ b/themes/baggy/view.twig
@@ -12,7 +12,7 @@
                 {% if navigate.next %}<li class="leftPosF"><a href="./?view=view&amp;id={{ navigate.nextid|e }}" class="top tool icon icon-previous"><span>{% trans "Next Article" %}</span></a></li>{% endif %}
                 <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.url | e | getDomain }}</span></a></li>
                 <li><a title="{% trans "Mark as read" %}" class="tool icon icon-check {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="javascript: void(null);" id="markAsRead"><span>{% trans "Toggle mark as read" %}</span></a></li>
-                {% if navigate.next %}<li><a title="{% trans "Mark as read and go to next article" %}" class="tool icon archiveandnext-icon" href="./?action=archive_and_next&amp;id={{ entry.id|e }}" id="markAsReadAndNext"><span>{% trans "Toggle mark as read and go to next article" %}</span></a></li>{% endif %}
+                {% if navigate.previous %}<li><a title="{% trans "Mark as read and go to next article" %}" class="tool icon icon-archiveandnext" href="./?action=archive_and_next&amp;id={{ entry.id|e }}" id="markAsReadAndNext"><span>{% trans "Toggle mark as read and go to next article" %}</span></a></li>{% endif %}
                 <li><a title="{% trans "Favorite" %}" class="tool icon icon-star {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="javascript: void(null);" id="setFav"><span>{% trans "Toggle favorite" %}</span></a></li>
                 <li><a title="{% trans "Delete" %}" class="tool delete icon icon-trash" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "Delete" %}</span></a></li>
                 {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="{% trans "Tweet" %}"><span>{% trans "Tweet" %}</span></a></li>{% endif %}