OAuth: Fix rare problem in which request tokens were sometimes being

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

diff --git a/lib/atom10feed.php b/lib/atom10feed.php
index 2d342e7854a8b56d29fa9e53405ff84f68c71a48..881df6605f3d05565afc6d850c666fd94fe9ff9b 100644 (file)
--- a/lib/atom10feed.php
+++ b/lib/atom10feed.php
@@ -109,7 +109,7 @@ class Atom10Feed extends XMLStringer
             $xs->element('name', null, $name);
         } else {
             throw new Atom10FeedException(
-                'author element must contain a name element.'
+                _('author element must contain a name element.')
             );
         }
 
@@ -146,15 +146,16 @@ class Atom10Feed extends XMLStringer
     }
 
     /**
-     * Add a activity feed subject via raw XML string
+     * Deprecated <activity:subject>; ignored
      *
      * @param string $xmlSubject An XML string representation of the subject
      *
      * @return void
      */
+
     function setActivitySubject($xmlSubject)
     {
-        $this->subject = $xmlSubject;
+        throw new ServerException(_('Don\'t use this method!'));
     }
 
     function getNamespaces()
@@ -178,7 +179,7 @@ class Atom10Feed extends XMLStringer
 
         $this->element(
             'generator', array(
-                'url'     => 'http://status.net',
+                'uri'     => 'http://status.net',
                 'version' => STATUSNET_VERSION
             ),
             'StatusNet'
@@ -323,5 +324,4 @@ class Atom10Feed extends XMLStringer
 
         array_push($this->links, $attrs);
     }
-
 }