diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-01-26 21:08:27 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-01-26 21:08:27 +0100 |
| commit | ef6df8aeca9f7b8dda96ab54fffd05f17b27606b (patch) | |
| tree | 5840b608e7434e88b2b48f21bd071dd71db58c2d /app/views | |
| parent | 34fe41ac78b6bd465c12086edbbd856d9533065c (diff) | |
| parent | 4872442c62f63ef97a0e12c43b4700b98ebcdc15 (diff) | |
Merge branch 'dev' into dev-1.14.0
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/configure/display.phtml | 2 | ||||
| -rw-r--r-- | app/views/helpers/export/articles.phtml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml index c6c08e3bc..58c4e219a 100644 --- a/app/views/configure/display.phtml +++ b/app/views/configure/display.phtml @@ -72,7 +72,7 @@ </div> <div class="form-group"> - <label class="group-name" for="theme"><?php echo _t('conf.display.icon.entry'); ?></label> + <label class="group-name"><?php echo _t('conf.display.icon.entry'); ?></label> <table> <thead> <tr> diff --git a/app/views/helpers/export/articles.phtml b/app/views/helpers/export/articles.phtml index eb2cb0924..2d1fcd133 100644 --- a/app/views/helpers/export/articles.phtml +++ b/app/views/helpers/export/articles.phtml @@ -56,6 +56,7 @@ foreach ($this->entriesRaw as $entryRaw) { 'feedUrl' => $feed == null ? '' : $feed->url(), ) ); + $article['categories'][] = $entry->isRead() ? 'user/-/state/com.google/read' : 'user/-/state/com.google/unread'; if ($entry->isFavorite()) { $article['categories'][] = 'user/-/state/com.google/starred'; } |