From: Kevin Decherf <kevin@kdecherf.com>
Date: Sun, 26 May 2019 15:47:44 +0000 (+0200)
Subject: Merge pull request #3965 from nicofrand/previewPic
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=5c0701ba41fd64ba471addb4a84af062277ab559;hp=d99e6423f4bd54595a8a805dd1efd0bd94e8bb09;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #3965 from nicofrand/previewPic

Preview picture: use the 1st pic retrieved if no og:image set
---

diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index d0266ec7..b632cb8a 100644
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:fpm
+FROM php:7.2-fpm
 
 # Default timezone. To change it, use the argument in the docker-compose.yml file
 ARG timezone='Europe/Paris'
diff --git a/src/Wallabag/ImportBundle/Import/InstapaperImport.php b/src/Wallabag/ImportBundle/Import/InstapaperImport.php
index 439c978c..f7bee9ef 100644
--- a/src/Wallabag/ImportBundle/Import/InstapaperImport.php
+++ b/src/Wallabag/ImportBundle/Import/InstapaperImport.php
@@ -93,6 +93,10 @@ class InstapaperImport extends AbstractImport
             return false;
         }
 
+        // most recent articles are first, which means we should create them at the end so they will show up first
+        // as Instapaper doesn't export the creation date of the article
+        $entries = array_reverse($entries);
+
         if ($this->producer) {
             $this->parseEntriesForProducer($entries);