aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-02-24 15:04:57 +0100
committerAndreas Fischer <bantu@phpbb.com>2013-02-24 15:04:57 +0100
commitafefe46591af3522770d23b662d6dac2e5352037 (patch)
treeaf9e63f6f8eae9301f13202f8941dde58484c6f7
parent6e1e62a77daf77ec3dd4fc131ffbb1a099936ef4 (diff)
parentb7a222cdd593edb3e61183d9e28707ac9005aa82 (diff)
downloadforums-afefe46591af3522770d23b662d6dac2e5352037.tar
forums-afefe46591af3522770d23b662d6dac2e5352037.tar.gz
forums-afefe46591af3522770d23b662d6dac2e5352037.tar.bz2
forums-afefe46591af3522770d23b662d6dac2e5352037.tar.xz
forums-afefe46591af3522770d23b662d6dac2e5352037.zip
Merge remote-tracking branch 'imkingdavid/ticket/11298' into develop
* imkingdavid/ticket/11298: [ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION
-rw-r--r--phpBB/includes/acp/info/acp_extensions.php4
-rw-r--r--phpBB/install/install_install.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/info/acp_extensions.php b/phpBB/includes/acp/info/acp_extensions.php
index 03d7059165..174b365af0 100644
--- a/phpBB/includes/acp/info/acp_extensions.php
+++ b/phpBB/includes/acp/info/acp_extensions.php
@@ -16,10 +16,10 @@ class acp_extensions_info
{
return array(
'filename' => 'acp_extensions',
- 'title' => 'ACP_EXTENSIONS_MANAGEMENT',
+ 'title' => 'ACP_EXTENSION_MANAGEMENT',
'version' => '1.0.0',
'modes' => array(
- 'main' => array('title' => 'ACP_EXTENSIONS', 'auth' => 'acl_a_extensions', 'cat' => array('ACP_EXTENSIONS_MANAGEMENT')),
+ 'main' => array('title' => 'ACP_EXTENSIONS', 'auth' => 'acl_a_extensions', 'cat' => array('ACP_EXTENSION_MANAGEMENT')),
),
);
}
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index dd90335480..16a527b252 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -2098,7 +2098,7 @@ class install_install extends module
),
'ACP_CAT_CUSTOMISE' => array(
'ACP_STYLE_MANAGEMENT',
- 'ACP_EXTENSIONS_MANAGEMENT',
+ 'ACP_EXTENSION_MANAGEMENT',
'ACP_LANGUAGE',
),
'ACP_CAT_MAINTENANCE' => array(