Make userAgent also work as an option to MWHttpRequest::factory() and MWHttpRequest...

diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index 1018658..23ea8df 100644 (file)
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -43,9 +43,6 @@ class Http {
                }
 
                $req = MWHttpRequest::factory( $url, $options );
-               if( isset( $options['userAgent'] ) ) {
-                       $req->setUserAgent( $options['userAgent'] );
-               }
                $status = $req->execute();
 
                if ( $status->isOK() ) {
@@ -210,6 +207,9 @@ class MWHttpRequest {
                } else {
                        $this->timeout = $wgHTTPTimeout;
                }
+               if( isset( $options['userAgent'] ) ) {
+                       $this->setUserAgent( $options['userAgent'] );
+               }
 
                $members = array( "postData", "proxy", "noProxy", "sslVerifyHost", "caInfo",
                                  "method", "followRedirects", "maxRedirects", "sslVerifyCert", "callback" );