[ticket/11150] Makes the customisation db lync dynamic

PHPBB3-11150
phpbb · Apr 23, 2017 · 1f9a269 · 1f9a269
1 parent 5376f67
commit 1f9a269
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 14 deletions.
diff --git a/phpBB/adm/style/acp_ext_catalog.html b/phpBB/adm/style/acp_ext_catalog.html
@@ -7,7 +7,7 @@ <h1>{{ lang( 'EXTENSIONS_CATALOG') }}</h1>
 <p>{{ lang( 'EXTENSIONS_CATALOG_EXPLAIN') }}</p>
 
 <fieldset class="quick quick-left">
-	<span class="small"><a href="https://www.phpbb.com/go/customise/extensions/3.2" target="_blank">{{ lang('BROWSE_EXTENSIONS_DATABASE') }}</a> &bull; <a href="javascript:phpbb.toggleDisplay('catalog_settings');">{{ lang('SETTINGS') }}</a></span>
+	<span class="small"><a href="https://www.phpbb.com/go/customise/extensions/{{ PHPBB_MAJOR }}" target="_blank">{{ lang('BROWSE_EXTENSIONS_DATABASE') }}</a> &bull; <a href="javascript:phpbb.toggleDisplay('catalog_settings');">{{ lang('SETTINGS') }}</a></span>
 </fieldset>
 
 {% if pagination is defined %}

diff --git a/phpBB/composer.lock b/phpBB/composer.lock
diff --git 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
@@ -820,7 +820,7 @@ public function list_enabled_exts(\phpbb\extension\manager $phpbb_extension_mana
 
 			if (isset($managed_packages[$block_vars['META_NAME']]))
 			{
-				$this->output_actions('disabled', [
+				$this->output_actions('enabled', [
 					'UPDATE' => $this->u_catalog_action . '&amp;action=update&amp;extension=' . urlencode($block_vars['META_NAME']),
 					'REMOVE' => [
 						'url' => $this->u_catalog_action . '&amp;action=remove&amp;extension=' . urlencode($block_vars['META_NAME']),

diff --git 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
@@ -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
@@ -701,7 +701,8 @@ protected function wrap(callable $callable)
 		{
 			$this->restore_cwd();
 
-			if ($super_globals) {
+			if ($super_globals)
+			{
 				$this->request->disable_super_globals();
 			}
 		}