Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/httpclient.php b/lib/httpclient.php
index a92c7d8c5be96d70cc8cbf14cd6bcd9e9b3032fc..c7abe121166b7aaa72578c382048876f3ea29d5f 100644 (file)
--- a/lib/httpclient.php
+++ b/lib/httpclient.php
@@ -158,7 +158,7 @@ class HTTPClient extends HTTP_Request2
         }
 
         parent::__construct($url, $method, $config);
-        $this->setHeader('User-Agent', $this->userAgent());
+        $this->setHeader('User-Agent', self::userAgent());
     }
 
     /**
@@ -247,9 +247,10 @@ class HTTPClient extends HTTP_Request2
      *
      * @return string
      */
-    function userAgent()
+    static public function userAgent()
     {
-        return "GNU Social/".STATUSNET_VERSION." (".STATUSNET_CODENAME.")";
+        return GNUSOCIAL_ENGINE . '/' . GNUSOCIAL_VERSION
+                . ' (' . GNUSOCIAL_CODENAME . ')';
     }
 
     /**