aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/info/acp_extensions.php
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-02-26 15:32:27 -0600
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-02-26 15:32:27 -0600
commita01da0c1ee83d15e4c466a80db78fd7e9859e637 (patch)
tree651cd313ae0d225d67fb0a4f1755d7f87b2546b7 /phpBB/includes/acp/info/acp_extensions.php
parentd2295b3d1f191710916b12980e13c97419ecf0ae (diff)
parent80bd78a5e5e1069773c05073cd47662a311bda79 (diff)
downloadforums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar
forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar.gz
forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar.bz2
forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar.xz
forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.zip
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts: phpBB/install/database_update.php
Diffstat (limited to 'phpBB/includes/acp/info/acp_extensions.php')
-rw-r--r--phpBB/includes/acp/info/acp_extensions.php4
1 files changed, 2 insertions, 2 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')),
),
);
}