From b75087a4333f7c59e812f0e88709f2f7339c5d90 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Tue, 15 Sep 2015 11:00:53 +0200 Subject: [PATCH] [ticket/11150] Repositories settings, beginning PHPBB3-11150 --- phpBB/adm/style/acp_ext_gallery.html | 16 ++++++++++++++-- phpBB/includes/acp/acp_extensions.php | 2 +- phpBB/language/en/acp/extensions.php | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/phpBB/adm/style/acp_ext_gallery.html b/phpBB/adm/style/acp_ext_gallery.html index 72ec92785c..fc641a8b23 100644 --- a/phpBB/adm/style/acp_ext_gallery.html +++ b/phpBB/adm/style/acp_ext_gallery.html @@ -33,12 +33,24 @@ +
+
+ + + {{ lang('COMPOSER_REPOSITORIES_EXPLAIN') }} + +
+
+ +
+

- {{ lang('WARNING') }}{{ lang('COLON') }} {{ lang('ENABLE_PACKAGIST_DETAIL') }} -
+ {{ lang('WARNING') }}{{ lang('COLON') }} {{ lang('ENABLE_PACKAGIST_EXPLAIN') }} + +
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index c12348a020..145d1c20a9 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -638,7 +638,7 @@ class acp_extensions 'enable_packagist' => $this->config['exts_composer_packagist'], 'enable_on_install' => $this->config['exts_composer_enable_on_install'], 'purge_on_remove' => $this->config['exts_composer_purge_on_remove'], - 'repositories' => unserialize($this->config['exts_composer_repositories']), + 'repositories' => ['a', 'b', 'c'],//unserialize($this->config['exts_composer_repositories']), ]); $this->request->disable_super_globals(); diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index f4ab2bf469..9d669a7587 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -148,5 +148,5 @@ $lang = array_merge($lang, array( 'ENABLE_ON_INSTALL' => 'Enable extensions when installing', 'PURGE_ON_REMOVE' => 'Purge extensions when removing', 'ENABLE_PACKAGIST' => 'Enable Packagist usage', - 'ENABLE_PACKAGIST_DETAIL' => 'TODO text explaining why packagist shouldn\'t be enabled, dev usage, etc...', + 'ENABLE_PACKAGIST_EXPLAIN' => 'TODO text explaining why packagist shouldn\'t be enabled, dev usage, etc...', ));