diff options
| author | CHItA <mate.bartus@gmail.com> | 2015-06-14 13:36:45 +0200 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2015-07-08 01:28:04 +0200 |
| commit | 5ce170dcc3f798627d95876ce6777882ffb8b83e (patch) | |
| tree | 2b4d08b5f9e266d691232c4314c8328848eeed0e | |
| parent | aa6a1c5939e4ae98d28e593ed2e09319c1341bba (diff) | |
| download | forums-5ce170dcc3f798627d95876ce6777882ffb8b83e.tar forums-5ce170dcc3f798627d95876ce6777882ffb8b83e.tar.gz forums-5ce170dcc3f798627d95876ce6777882ffb8b83e.tar.bz2 forums-5ce170dcc3f798627d95876ce6777882ffb8b83e.tar.xz forums-5ce170dcc3f798627d95876ce6777882ffb8b83e.zip | |
[ticket/13740] Remove ActiveXObject as it is supported by IE versions >= 8
PHPBB3-13740
| -rw-r--r-- | phpBB/assets/javascript/installer.js | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/phpBB/assets/javascript/installer.js b/phpBB/assets/javascript/installer.js index eafcd78f47..68a4eb499b 100644 --- a/phpBB/assets/javascript/installer.js +++ b/phpBB/assets/javascript/installer.js @@ -3,7 +3,6 @@ */ (function($) { // Avoid conflicts with other libraries - 'use strict'; // Installer variables @@ -26,18 +25,11 @@ * as of now, jQuery does not provide access to the response until * the connection is not closed. * - * @return XMLHttpRequest|ActiveXObject + * @return XMLHttpRequest */ function createXhrObject() { - var xhReq; - - if (window.XMLHttpRequest) { - xhReq = new XMLHttpRequest(); - } - else if (window.ActiveXObject) { - xhReq = new ActiveXObject("Msxml2.XMLHTTP"); - } - + var xhReq = new XMLHttpRequest(); + xhReq.setRequestHeader('X-Requested-With', 'XMLHttpRequest'); return xhReq; } @@ -336,7 +328,6 @@ var xhReq = createXhrObject(); xhReq.open('POST', $form.attr('action'), true); - xhReq.setRequestHeader('X-Requested-With', 'XMLHttpRequest'); xhReq.setRequestHeader('Content-type', 'application/x-www-form-urlencoded'); xhReq.send(getFormFields($form, $submitBtn)); |