X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fuserbyid.php;h=09fb4258d9c4a3c4fd0a27813c47707d77e6042e;hb=c85e78ac3c03bd584a6da3a0a7b5cb9160cc9324;hp=802bcb0815384d5c94295d0c4eadd85350480204;hpb=a08c76a4342cfb4b3d772f6880ba0b8f3153b246;p=quix0rs-gnu-social.git

diff --git a/actions/userbyid.php b/actions/userbyid.php
index 802bcb0815..09fb4258d9 100644
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * User by ID action class.
  *
@@ -47,35 +46,40 @@ class UserbyidAction extends Action
 {
      /**
      * Is read only?
-     * 
+     *
      * @return boolean true
      */
     function isReadOnly($args)
-    {                
+    {
         return true;
     }
 
      /**
      * Class handler.
-     * 
+     *
      * @param array $args array of arguments
      *
      * @return nothing
      */
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
         $id = $this->trimmed('id');
         if (!$id) {
-            $this->clientError(_('No id.'));
+            // TRANS: Client error displayed trying to find a user by ID without providing an ID.
+            $this->clientError(_('No ID.'));
         }
-        $user =& User::staticGet($id);
+        $user = User::getKV($id);
         if (!$user) {
+            // TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
             $this->clientError(_('No such user.'));
         }
 
-        // support redirecting to FOAF rdf/xml if the agent prefers it
-        $page_prefs = 'application/rdf+xml,text/html,application/xhtml+xml,application/xml;q=0.3,text/xml;q=0.2';
+        // Support redirecting to FOAF rdf/xml if the agent prefers it...
+        // Internet Explorer doesn't specify "text/html" and does list "*/*"
+        // at least through version 8. We need to list text/html up front to
+        // ensure that only user-agents who specifically ask for RDF get it.
+        $page_prefs = 'text/html,application/xhtml+xml,application/rdf+xml,application/xml;q=0.3,text/xml;q=0.2';
         $httpaccept = isset($_SERVER['HTTP_ACCEPT'])
                       ? $_SERVER['HTTP_ACCEPT'] : null;
         $type       = common_negotiate_type(common_accept_to_prefs($httpaccept),
@@ -85,4 +89,3 @@ class UserbyidAction extends Action
         common_redirect($url, 303);
     }
 }
-