mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2019-10-23 21:03:55 +02:00
parent b7fe147da8 95880a5f49
commit 0bda740b37
16 changed files with 206 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
phpBB/phpbb/db/migration/data/v330/jquery_update.php Normal file
View 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\v330;
class jquery_update extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return $this->config['load_jquery_url'] === '//ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js';
}
static public function depends_on()
{
return array(
'\phpbb\db\migration\data\v330\dev',
);
}
public function update_data()
{
return array(
array('config.update', array('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js')),
);
}
}

41
phpBB/phpbb/db/migration/data/v330/v330b1.php Normal file
View File

@@ -0,0 +1,41 @@
<?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\v330;
class v330b1 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.3.0-b1', '>=');
}
static public function depends_on()
{
return array(
'\phpbb\db\migration\data\v330\jquery_update',
'\phpbb\db\migration\data\v330\reset_password',
'\phpbb\db\migration\data\v330\remove_attachment_flash',
'\phpbb\db\migration\data\v330\remove_max_pass_chars',
'\phpbb\db\migration\data\v32x\v328',
'\phpbb\db\migration\data\v330\dev',
);
}
public function update_data()
{
return array(
array('config.update', array('version', '3.3.0-b1')),
);
}
}

2
phpBB/phpbb/install/controller/helper.php
View File

@@ -267,7 +267,7 @@ class helper
'L_SKIP' => $this->language->lang('SKIP'),
'PAGE_TITLE' => $this->language->lang($page_title),
'T_IMAGE_PATH' => $this->path_helper->get_web_root_path() . $path . 'images',
'T_JQUERY_LINK' => $this->path_helper->get_web_root_path() . $path . '../assets/javascript/jquery.min.js',
'T_JQUERY_LINK' => $this->path_helper->get_web_root_path() . $path . '../assets/javascript/jquery-3.4.1.min.js',
'T_TEMPLATE_PATH' => $this->path_helper->get_web_root_path() . $path . 'style',
'T_ASSETS_PATH' => $this->path_helper->get_web_root_path() . $path . '../assets',