diff --git a/phpBB/adm/style/acp_ext_catalog.html b/phpBB/adm/style/acp_ext_catalog.html index 787b620e62..1be94258e8 100644 --- a/phpBB/adm/style/acp_ext_catalog.html +++ b/phpBB/adm/style/acp_ext_catalog.html @@ -7,7 +7,7 @@

{{ lang( 'EXTENSIONS_CATALOG_EXPLAIN') }}

- {{ lang('BROWSE_EXTENSIONS_DATABASE') }} • {{ lang('SETTINGS') }} + {{ lang('BROWSE_EXTENSIONS_DATABASE') }} • {{ lang('SETTINGS') }}
{% if pagination is defined %} diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 81903906a7..4fff2b628a 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -96,32 +96,32 @@ }, { "name": "composer/composer", - "version": "1.2.0", + "version": "1.3.3", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "b49a006748a460f8dae6500ec80ed021501ce969" + "reference": "989d68725bc8ebf97e795d4feb386f52adb096e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/b49a006748a460f8dae6500ec80ed021501ce969", - "reference": "b49a006748a460f8dae6500ec80ed021501ce969", + "url": "https://api.github.com/repos/composer/composer/zipball/989d68725bc8ebf97e795d4feb386f52adb096e3", + "reference": "989d68725bc8ebf97e795d4feb386f52adb096e3", "shasum": "" }, "require": { "composer/ca-bundle": "^1.0", "composer/semver": "^1.0", "composer/spdx-licenses": "^1.0", - "justinrainbow/json-schema": "^1.6 || ^2.0", + "justinrainbow/json-schema": "^1.6 || ^2.0 || ^3.0 || ^4.0", "php": "^5.3.2 || ^7.0", "psr/log": "^1.0", "seld/cli-prompt": "^1.0", "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.0", - "symfony/console": "^2.5 || ^3.0", - "symfony/filesystem": "^2.5 || ^3.0", - "symfony/finder": "^2.2 || ^3.0", - "symfony/process": "^2.1 || ^3.0" + "symfony/console": "^2.7 || ^3.0", + "symfony/filesystem": "^2.7 || ^3.0", + "symfony/finder": "^2.7 || ^3.0", + "symfony/process": "^2.7 || ^3.0" }, "require-dev": { "phpunit/phpunit": "^4.5 || ^5.0.5", @@ -138,7 +138,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -169,7 +169,7 @@ "dependency", "package" ], - "time": "2016-07-18 23:28:52" + "time": "2017-03-08 10:06:43" }, { "name": "composer/semver", diff --git a/phpBB/config/default/container/services_extensions.yml b/phpBB/config/default/container/services_extensions.yml index dda02340ab..e07ec1fd09 100644 --- a/phpBB/config/default/container/services_extensions.yml +++ b/phpBB/config/default/container/services_extensions.yml @@ -16,6 +16,7 @@ services: arguments: - '%core.root_path%' - '@filesystem' + - '@request' - '@config' ext.composer.manager: diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index ba68158fd7..bedd387ee3 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -820,7 +820,7 @@ class acp_extensions if (isset($managed_packages[$block_vars['META_NAME']])) { - $this->output_actions('disabled', [ + $this->output_actions('enabled', [ 'UPDATE' => $this->u_catalog_action . '&action=update&extension=' . urlencode($block_vars['META_NAME']), 'REMOVE' => [ 'url' => $this->u_catalog_action . '&action=remove&extension=' . urlencode($block_vars['META_NAME']), diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 15b35ae646..c16792225d 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4324,6 +4324,9 @@ function page_header($page_title = '', $display_online_list = false, $item_id = $controller_helper = $phpbb_container->get('controller.helper'); $notification_mark_hash = generate_link_hash('mark_all_notifications_read'); + $phpbb_version_parts = explode('.', PHPBB_VERSION, 3); + $phpbb_major = $phpbb_version_parts[0] . '.' . $phpbb_version_parts[1]; + // The following assigns all _common_ variables that may be used at any point in a template. $template->assign_vars(array( 'SITENAME' => $config['sitename'], @@ -4357,6 +4360,8 @@ function page_header($page_title = '', $display_online_list = false, $item_id = 'SESSION_ID' => $user->session_id, 'ROOT_PATH' => $web_path, 'BOARD_URL' => $board_url, + 'PHPBB_VERSION' => PHPBB_VERSION, + 'PHPBB_MAJOR' => $phpbb_major, 'L_LOGIN_LOGOUT' => $l_login_logout, 'L_INDEX' => ($config['board_index_text'] !== '') ? $config['board_index_text'] : $user->lang['FORUM_INDEX'], diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 8bf42aa36e..c79a84f8d4 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -66,6 +66,9 @@ function adm_page_header($page_title) } } + $phpbb_version_parts = explode('.', PHPBB_VERSION, 3); + $phpbb_major = $phpbb_version_parts[0] . '.' . $phpbb_version_parts[1]; + $template->assign_vars(array( 'PAGE_TITLE' => $page_title, 'USERNAME' => $user->data['username'], @@ -75,6 +78,8 @@ function adm_page_header($page_title) 'SESSION_ID' => $user->session_id, 'ROOT_PATH' => $phpbb_root_path, 'ADMIN_ROOT_PATH' => $phpbb_admin_path, + 'PHPBB_VERSION' => PHPBB_VERSION, + 'PHPBB_MAJOR' => $phpbb_major, 'U_LOGOUT' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout'), 'U_ADM_LOGOUT' => append_sid("{$phpbb_admin_path}index.$phpEx", 'action=admlogout'), diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php index a5153d5f05..6de57541fb 100644 --- a/phpBB/phpbb/composer/installer.php +++ b/phpBB/phpbb/composer/installer.php @@ -701,7 +701,8 @@ class installer { $this->restore_cwd(); - if ($super_globals) { + if ($super_globals) + { $this->request->disable_super_globals(); } }