mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
Merge pull request #43 from phpbb/security/229
[security/229] Update jQuery to 1.12.4
This commit is contained in:
commit
85ecd2c7be
3 changed files with 49 additions and 4 deletions
|
@ -20,6 +20,13 @@ var phpbbAlertTimer = null;
|
||||||
|
|
||||||
phpbb.isTouch = (window && typeof window.ontouchstart !== 'undefined');
|
phpbb.isTouch = (window && typeof window.ontouchstart !== 'undefined');
|
||||||
|
|
||||||
|
// Add ajax pre-filter to prevent cross-domain script execution
|
||||||
|
$.ajaxPrefilter(function(s) {
|
||||||
|
if (s.crossDomain) {
|
||||||
|
s.contents.script = false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Display a loading screen
|
* Display a loading screen
|
||||||
*
|
*
|
||||||
|
|
9
phpBB/assets/javascript/jquery.min.js
vendored
9
phpBB/assets/javascript/jquery.min.js
vendored
File diff suppressed because one or more lines are too long
37
phpBB/phpbb/db/migration/data/v32x/jquery_update.php
Normal file
37
phpBB/phpbb/db/migration/data/v32x/jquery_update.php
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* This file is part of the phpBB Forum Software package.
|
||||||
|
*
|
||||||
|
* @copyright (c) phpBB Limited <https://www.phpbb.com>
|
||||||
|
* @license GNU General Public License, version 2 (GPL-2.0)
|
||||||
|
*
|
||||||
|
* For full copyright and license information, please see
|
||||||
|
* the docs/CREDITS.txt file.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace phpbb\db\migration\data\v32x;
|
||||||
|
|
||||||
|
class jquery_update extends \phpbb\db\migration\migration
|
||||||
|
{
|
||||||
|
public function effectively_installed()
|
||||||
|
{
|
||||||
|
return $this->config['load_jquery_url'] === '//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js';
|
||||||
|
}
|
||||||
|
|
||||||
|
static public function depends_on()
|
||||||
|
{
|
||||||
|
return array(
|
||||||
|
'\phpbb\db\migration\data\v32x\v325rc1',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function update_data()
|
||||||
|
{
|
||||||
|
return array(
|
||||||
|
array('config.update', array('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js')),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue