From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sun, 2 Oct 2016 15:37:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 2.1
X-Git-Tag: 2.1.0~6
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=77557d289bafc088baf806e4744f110dfd959300;hp=-c;p=github%2Fwallabag%2Fwallabag.git

Merge remote-tracking branch 'origin/master' into 2.1
---

77557d289bafc088baf806e4744f110dfd959300
diff --combined src/Wallabag/CoreBundle/Helper/EntriesExport.php
index 1dfa12c8,ccf4e4f3..0c627dcd
--- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php
+++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
@@@ -25,7 -25,7 +25,7 @@@ class EntriesExpor
      private $footerTemplate = '<div style="text-align:center;">
          <p>Produced by wallabag with %EXPORT_METHOD%</p>
          <p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p>
-         </div';
+         </div>';
  
      /**
       * @param Config $craueConfig CraueConfig instance to get wallabag instance url from database
@@@ -302,7 -302,7 +302,7 @@@
          $enclosure = '"';
          $handle = fopen('php://memory', 'rb+');
  
 -        fputcsv($handle, ['Title', 'URL', 'Content', 'Tags', 'MIME Type', 'Language'], $delimiter, $enclosure);
 +        fputcsv($handle, ['Title', 'URL', 'Content', 'Tags', 'MIME Type', 'Language', 'Creation date'], $delimiter, $enclosure);
  
          foreach ($this->entries as $entry) {
              fputcsv(
@@@ -315,7 -315,6 +315,7 @@@
                      implode(', ', $entry->getTags()->toArray()),
                      $entry->getMimetype(),
                      $entry->getLanguage(),
 +                    $entry->getCreatedAt()->format('d/m/Y h:i:s'),
                  ],
                  $delimiter,
                  $enclosure