Merge "When aborting EnhancedRC block line, block should reflect that"

[lhc/web/wiklou.git] / resources / src / mediawiki.api / mediawiki.ForeignApi.js

diff --git a/resources/src/mediawiki.api/mediawiki.ForeignApi.js b/resources/src/mediawiki.api/mediawiki.ForeignApi.js
index c835345..b8cc059 100644 (file)
--- a/resources/src/mediawiki.api/mediawiki.ForeignApi.js
+++ b/resources/src/mediawiki.api/mediawiki.ForeignApi.js
@@ -76,9 +76,9 @@
         * @return {string}
         */
        CoreForeignApi.prototype.getOrigin = function () {
-               var origin = window.location.protocol + '//' + window.location.hostname;
-               if ( window.location.port ) {
-                       origin += ':' + window.location.port;
+               var origin = location.protocol + '//' + location.hostname;
+               if ( location.port ) {
+                       origin += ':' + location.port;
                }
                return origin;
        };
@@ -90,7 +90,7 @@
                var url, origin, newAjaxOptions;
 
                // 'origin' query parameter must be part of the request URI, and not just POST request body
-               if ( ajaxOptions.type !== 'GET' ) {
+               if ( ajaxOptions.type === 'POST' ) {
                        url = ( ajaxOptions && ajaxOptions.url ) || this.defaults.ajax.url;
                        origin = ( parameters && parameters.origin ) || this.defaults.parameters.origin;
                        url += ( url.indexOf( '?' ) !== -1 ? '&' : '?' ) +