Misses this file to merge. I like the comments.

[quix0rs-gnu-social.git] / lib / atom10feed.php

diff --git a/lib/atom10feed.php b/lib/atom10feed.php
index 8d4b66d8b89211d977c9b36d89c11edbb1193f33..2bba6d0a91474bf5ac7271c3cc35aa83b2574e2c 100644 (file)
--- a/lib/atom10feed.php
+++ b/lib/atom10feed.php
@@ -108,8 +108,8 @@ class Atom10Feed extends XMLStringer
         if (!empty($name)) {
             $xs->element('name', null, $name);
         } else {
-            // TRANS: Atom feed exception thrown when an author element does not contain a name element.
             throw new Atom10FeedException(
+                // TRANS: Atom feed exception thrown when an author element does not contain a name element.
                 _('Author element must contain a name element.')
             );
         }
@@ -146,20 +146,6 @@ class Atom10Feed extends XMLStringer
         }
     }
 
-    /**
-     * Deprecated <activity:subject>; ignored
-     *
-     * @param string $xmlSubject An XML string representation of the subject
-     *
-     * @return void
-     */
-
-    function setActivitySubject($xmlSubject)
-    {
-        // TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-        throw new ServerException(_('Do not use this method!'));
-    }
-
     function getNamespaces()
     {
         return $this->namespaces;
@@ -167,7 +153,7 @@ class Atom10Feed extends XMLStringer
 
     function initFeed()
     {
-        $this->xw->startDocument('1.0', 'UTF-8');
+        $this->startXML();
         $commonAttrs = array('xml:lang' => 'en-US');
         foreach ($this->namespaces as $prefix => $uri) {
             if ($prefix == '') {
@@ -181,10 +167,10 @@ class Atom10Feed extends XMLStringer
 
         $this->element(
             'generator', array(
-                'uri'     => 'http://status.net',
-                'version' => STATUSNET_VERSION
+                'uri'     => 'https://gnu.io/social',
+                'version' => GNUSOCIAL_VERSION
             ),
-            'StatusNet'
+            'GNU social'
         );
 
         $this->element('id', null, $this->id);