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 d0266ec74496274b7a4fd2c0c780659361982e1c..b632cb8a2177fc6806428cb31c7e0e130d65367d 100644 (file)
--- 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 439c978c71f02a6d4953cf25e7475b2a9a63582a..f7bee9ef01dc13625d94f024f760efa103be32cd 100644 (file)
--- 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);