Make updateAuthor code simpler to read

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Helper / EntriesExport.php

diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
index d749dcf91adc422a832ec207bed4362af4085f80..64d8219325d532e3eed2f8d88a7b31286489f26f 100644 (file)
--- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php
+++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
@@ -73,7 +73,9 @@ class EntriesExport
     }
 
     /**
-     * Sets the author for just one entry.
+     * Sets the author for one entry or category.
+     *
+     * The publishers are used, or the domain name if empty.
      *
      * @param string $method Method to get articles
      *
@@ -81,10 +83,17 @@ class EntriesExport
      */
     public function updateAuthor($method)
     {
-        $this->author = $method.' authors';
+        if ('entry' !== $method) {
+            $this->author = $method . ' authors';
 
-        if ('entry' === $method) {
-            $this->author = $this->entries[0]->getDomainName();
+            return $this;
+        }
+
+        $this->author = $this->entries[0]->getDomainName();
+
+        $publishedBy = $this->entries[0]->getPublishedBy();
+        if (!empty($publishedBy)) {
+            $this->author = implode(', ', $publishedBy);
         }
 
         return $this;