diff options
| author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-09-22 07:51:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-22 07:51:05 +0200 |
| commit | 637aa17e6b52dd8021854a809053560a27caca72 (patch) | |
| tree | 1d82bcc406fe0e53ec05e242c46095316f24eb07 /src/Wallabag | |
| parent | 32e95760f567e5849dd71aaba9aabb1ab56bcd0a (diff) | |
| parent | 389d55f86b962a448d7a5052a5c0cf438d161c41 (diff) | |
| download | wallabag-637aa17e6b52dd8021854a809053560a27caca72.tar.gz wallabag-637aa17e6b52dd8021854a809053560a27caca72.tar.zst wallabag-637aa17e6b52dd8021854a809053560a27caca72.zip | |
Merge pull request #2301 from wallabag/fix-rss-feeds
fix feeds not syncing on android app
Diffstat (limited to 'src/Wallabag')
| -rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig | 10 | ||||
| -rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig | 10 |
2 files changed, 2 insertions, 18 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig index 6cabcf44..288bb54f 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig | |||
| @@ -16,15 +16,7 @@ | |||
| 16 | <guid>{{ entry.url }}</guid> | 16 | <guid>{{ entry.url }}</guid> |
| 17 | <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate> | 17 | <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate> |
| 18 | <description> | 18 | <description> |
| 19 | <![CDATA[ | 19 | <![CDATA[{%- if entry.readingTime > 0 -%}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}{%- else -%}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{%- endif %}{{ entry.content|raw -}}]]> |
| 20 | {%- if entry.readingTime > 0 -%} | ||
| 21 | {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }} | ||
| 22 | {%- else -%} | ||
| 23 | {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} | ||
| 24 | {%- endif %} | ||
| 25 | |||
| 26 | {{ entry.content|raw -}} | ||
| 27 | ]]> | ||
| 28 | </description> | 20 | </description> |
| 29 | </item> | 21 | </item> |
| 30 | 22 | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig index 6cabcf44..288bb54f 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig | |||
| @@ -16,15 +16,7 @@ | |||
| 16 | <guid>{{ entry.url }}</guid> | 16 | <guid>{{ entry.url }}</guid> |
| 17 | <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate> | 17 | <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate> |
| 18 | <description> | 18 | <description> |
| 19 | <![CDATA[ | 19 | <![CDATA[{%- if entry.readingTime > 0 -%}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}{%- else -%}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{%- endif %}{{ entry.content|raw -}}]]> |
| 20 | {%- if entry.readingTime > 0 -%} | ||
| 21 | {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }} | ||
| 22 | {%- else -%} | ||
| 23 | {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} | ||
| 24 | {%- endif %} | ||
| 25 | |||
| 26 | {{ entry.content|raw -}} | ||
| 27 | ]]> | ||
| 28 | </description> | 20 | </description> |
| 29 | </item> | 21 | </item> |
| 30 | 22 | ||