diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-12 21:01:20 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-12 21:01:20 -0500 |
| commit | 5da78cae0950c60fd02480d896fe44ee29b33d6d (patch) | |
| tree | 475ea31673d3081af179a741a629de6e3d679fd4 /phpBB/includes | |
| parent | 9420647c43b300699afe6fe72f09d1746daf64a2 (diff) | |
| parent | a5783211c90e226a9d1a2b3636f63f1a80aced19 (diff) | |
| download | forums-5da78cae0950c60fd02480d896fe44ee29b33d6d.tar forums-5da78cae0950c60fd02480d896fe44ee29b33d6d.tar.gz forums-5da78cae0950c60fd02480d896fe44ee29b33d6d.tar.bz2 forums-5da78cae0950c60fd02480d896fe44ee29b33d6d.tar.xz forums-5da78cae0950c60fd02480d896fe44ee29b33d6d.zip | |
Merge PR #985 branch 'imkingdavid/ticket/11088' into develop
* imkingdavid/ticket/11088:
[ticket/11088] Pass required objects in as arguments
[ticket/11088] Globalize objects in new permission function
[ticket/11088] Move permission creation to a function
[ticket/11088] Copy a_styles permission for a_extensions
[ticket/11088] Remove extraneous word from sentence in comment
[ticket/11088] Changed "file extensions" to "attachment extensions"
[ticket/11088] Fix the database updater to correctly manipulate the modules
[ticket/11088] Put language pack module move below extension module creation
[ticket/11088] Untested, progress on update script
[ticket/11088] Fix typo (period instead of comma)
[ticket/11088] Untested progress for update script
[ticket/11088] Added missing comma
[ticket/11088] Removed added space
[ticket/11088] Move style, extension and language pack management to customise
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/info/acp_extensions.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/acp/info/acp_language.php | 2 |
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 f5953fb1dd..03d7059165 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', + 'title' => 'ACP_EXTENSIONS_MANAGEMENT', 'version' => '1.0.0', 'modes' => array( - 'main' => array('title' => 'ACP_EXTENSIONS', 'auth' => 'acl_a_extensions', 'cat' => array('ACP_GENERAL_TASKS')), + 'main' => array('title' => 'ACP_EXTENSIONS', 'auth' => 'acl_a_extensions', 'cat' => array('ACP_EXTENSIONS_MANAGEMENT')), ), ); } diff --git a/phpBB/includes/acp/info/acp_language.php b/phpBB/includes/acp/info/acp_language.php index 85dfb119ea..7f33a22fa6 100644 --- a/phpBB/includes/acp/info/acp_language.php +++ b/phpBB/includes/acp/info/acp_language.php @@ -19,7 +19,7 @@ class acp_language_info 'title' => 'ACP_LANGUAGE', 'version' => '1.0.0', 'modes' => array( - 'lang_packs' => array('title' => 'ACP_LANGUAGE_PACKS', 'auth' => 'acl_a_language', 'cat' => array('ACP_GENERAL_TASKS')), + 'lang_packs' => array('title' => 'ACP_LANGUAGE_PACKS', 'auth' => 'acl_a_language', 'cat' => array('ACP_LANGUAGE')), ), ); } |