mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-12 11:44:08 +02:00
Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (666 commits) [ticket/11077] Remove code from old global announcements system [ticket/11189] Replace DEBUG_EXTRA with DEBUG [ticket/11189] Always log critical errors when in cron or in image output [ticket/11187] Added a blank array to fix errors in functional tests [ticket/10780] Make L_COLON available in the installer. [ticket/11183] Remove $load_extensions and weird dl() calls [ticket/10970] Added extra documentation to parse_dynamic_path. [ticket/10939] Added documentation for phpbb_request::file [ticket/10865] Use code tags for install/database_update.php. [ticket/10865] Should have been a slash. [ticket/10780] Use L_COLON on LDAP page. [ticket/10780] Use L_COLON on search backend ACP pages. [ticket/10780] Use L_COLON for "download all attachments". [ticket/10780] Use colon from language in ucp_pm_compose.php where possible. [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html. [ticket/10780] Replace colon usage in adm template output with {L_COLON} [ticket/10780] Replace colon usage in template output with {L_COLON} [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus] [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [ticket/10172] Show prosilver birthday list even if there are no birthdays. ... Conflicts: phpBB/common.php phpBB/download/file.php phpBB/includes/db/dbal.php phpBB/includes/db/firebird.php phpBB/includes/db/mssql.php phpBB/includes/db/mssql_odbc.php phpBB/includes/db/mssqlnative.php phpBB/includes/db/mysql.php phpBB/includes/db/mysqli.php phpBB/includes/db/oracle.php phpBB/includes/db/postgres.php phpBB/includes/db/sqlite.php phpBB/includes/extension/manager.php phpBB/install/database_update.php
This commit is contained in:
@@ -348,7 +348,7 @@ class install_update extends module
|
||||
|
||||
// We are directly within an update. To make sure our update list is correct we check its status.
|
||||
$update_list = ($request->variable('check_again', false, false, phpbb_request_interface::POST)) ? false : $cache->get('_update_list');
|
||||
$modified = ($update_list !== false) ? @filemtime($cache->cache_dir . 'data_update_list.' . $phpEx) : 0;
|
||||
$modified = ($update_list !== false) ? @filemtime($cache->get_driver()->cache_dir . 'data_update_list.' . $phpEx) : 0;
|
||||
|
||||
// Make sure the list is up-to-date
|
||||
if ($update_list !== false)
|
||||
@@ -861,7 +861,14 @@ class install_update extends module
|
||||
$test_connection = false;
|
||||
if ($test_ftp_connection || $submit)
|
||||
{
|
||||
$transfer = new $method(request_var('host', ''), request_var('username', ''), request_var('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
|
||||
$transfer = new $method(
|
||||
request_var('host', ''),
|
||||
request_var('username', ''),
|
||||
htmlspecialchars_decode($request->untrimmed_variable('password', '')),
|
||||
request_var('root_path', ''),
|
||||
request_var('port', ''),
|
||||
request_var('timeout', '')
|
||||
);
|
||||
$test_connection = $transfer->open_session();
|
||||
|
||||
// Make sure that the directory is correct by checking for the existence of common.php
|
||||
@@ -947,7 +954,14 @@ class install_update extends module
|
||||
}
|
||||
else
|
||||
{
|
||||
$transfer = new $method(request_var('host', ''), request_var('username', ''), request_var('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
|
||||
$transfer = new $method(
|
||||
request_var('host', ''),
|
||||
request_var('username', ''),
|
||||
htmlspecialchars_decode($request->untrimmed_variable('password', '')),
|
||||
request_var('root_path', ''),
|
||||
request_var('port', ''),
|
||||
request_var('timeout', '')
|
||||
);
|
||||
$transfer->open_session();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user