formats: Use same general entity generation order

formats/AtomFormat.php

@@ -23,13 +23,11 @@ class AtomFormat extends FormatAbstract{
 
         $entries = '';
         foreach($this->getDatas() as $data){
-            $entryAuthor = is_null($data->author) ? $title : $this->xml_encode($data->author);
+            $entryAuthor = is_null($data->author) ? '' : $this->xml_encode($data->author);
             $entryTitle = is_null($data->title) ? '' : $this->xml_encode($data->title);
             $entryUri = is_null($data->uri) ? '' : $this->xml_encode($data->uri);
             $entryTimestamp = is_null($data->timestamp) ? '' : $this->xml_encode(date(DATE_ATOM, $data->timestamp));
-            // We prevent content from closing the CDATA too early.
             $entryContent = is_null($data->content) ? '' : $this->xml_encode($this->sanitizeHtml($data->content));
-
             $entries .= <<<EOD
 
     <entry>

formats/HtmlFormat.php

@@ -12,14 +12,14 @@ class HtmlFormat extends FormatAbstract{
         $extraInfos = $this->getExtraInfos();
         $title = htmlspecialchars($extraInfos['name']);
         $uri = htmlspecialchars($extraInfos['uri']);
-	$atomquery = str_replace('format=HtmlFormat', 'format=AtomFormat', htmlentities($_SERVER['QUERY_STRING']));
+        $atomquery = str_replace('format=HtmlFormat', 'format=AtomFormat', htmlentities($_SERVER['QUERY_STRING']));
 
         $entries = '';
         foreach($this->getDatas() as $data){
-            $entryUri = is_null($data->uri) ? $uri : $data->uri;
+            $entryAuthor = is_null($data->author) ? '' : '<br /><p class="author">by: ' . $data->author . '</p>';
             $entryTitle = is_null($data->title) ? '' : $this->sanitizeHtml(strip_tags($data->title));
+            $entryUri = is_null($data->uri) ? $uri : $data->uri;
             $entryTimestamp = is_null($data->timestamp) ? '' : '<time datetime="' . date(DATE_ATOM, $data->timestamp) . '">' . date(DATE_ATOM, $data->timestamp) . '</time>';
-            $entryAuthor = is_null($data->author) ? '' : '<br /><p class="author">by: ' . $data->author . '</p>';
             $entryContent = is_null($data->content) ? '' : '<div class="content">' . $this->sanitizeHtml($data->content). '</div>';
             $entries .= <<<EOD
 

formats/MrssFormat.php

@@ -21,13 +21,11 @@ class MrssFormat extends FormatAbstract{
 
         $items = '';
         foreach($this->getDatas() as $data){
+            $itemAuthor = is_null($data->author) ? '' : $this->xml_encode($data->author);
             $itemTitle = strip_tags(is_null($data->title) ? '' : $this->xml_encode($data->title));
             $itemUri = is_null($data->uri) ? '' : $this->xml_encode($data->uri);
-            $itemAuthor = is_null($data->author) ? $title : $this->xml_encode($data->author);
             $itemTimestamp = is_null($data->timestamp) ? '' : $this->xml_encode(date(DATE_RFC2822, $data->timestamp));
-            // We prevent content from closing the CDATA too early.
             $itemContent = is_null($data->content) ? '' : $this->xml_encode($this->sanitizeHtml($data->content));
-
             $items .= <<<EOD
 
     <item>