aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-09-17 14:43:49 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-09-17 14:43:49 +0000
commite43b9d2f9baf0a4d92f9e9b70ab766fd248f7180 (patch)
tree6b648e11bca9d95f2b43ca50a75393973e57c9c2 /phpBB/language
parentc6c3df2a730bb825a315c21cdd6c38988d683062 (diff)
downloadforums-e43b9d2f9baf0a4d92f9e9b70ab766fd248f7180.tar
forums-e43b9d2f9baf0a4d92f9e9b70ab766fd248f7180.tar.gz
forums-e43b9d2f9baf0a4d92f9e9b70ab766fd248f7180.tar.bz2
forums-e43b9d2f9baf0a4d92f9e9b70ab766fd248f7180.tar.xz
forums-e43b9d2f9baf0a4d92f9e9b70ab766fd248f7180.zip
removed debug_extra notice
other fixes state that mysql.php shouldn't be used for mysql 4.1+ (actually, it should deny using it) git-svn-id: file:///svn/phpbb/trunk@6377 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/common.php2
-rw-r--r--phpBB/language/en/acp/permissions_phpbb.php9
2 files changed, 3 insertions, 8 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 50f09f156b..269cea8254 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -262,8 +262,6 @@ $lang = array_merge($lang, array(
'USER_CONTROL_PANEL' => 'User Control Panel',
'WARNING' => 'Warning',
-
- 'DEBUG_EXTRA_WARNING' => 'The DEBUG_EXTRA constant is defined which is only meant for development purposes by the developers.<br />The board is running additional code to display sql reports, which slows down the board in a significant manner. Additionally sql errors are always displayed with a full backtrace to all users instead of displaying it solely to administrators, which is the default setting.<br /><br />With this said, please be aware that you are currently running your installation in <b>Debug Mode</b> and should you take this board live, please remove the constant from the config file.',
));
// PHP info
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index b0bc770a74..8577210862 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -8,6 +8,7 @@
* @copyright (c) 2005 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
+* @todo You are able to put your permission sets into a seperate file too by prefixing it with permissions_ and putting it into the acp language folder.
*/
/**
@@ -34,20 +35,16 @@ if (empty($lang) || !is_array($lang))
Please add your permission settings this way:
// Adding new category
- $lang['permission_cats']['bugs'] = 'Bugs';
+ $lang['permission_cat']['bugs'] = 'Bugs';
// Adding new permission set
- $lang['permission_sets']['bug_'] = 'Bug Permissions';
+ $lang['permission_type']['bug_'] = 'Bug Permissions';
// Adding the permissions
$lang = array_merge($lang, array(
'acl_bug_view' => array('lang' => 'Can view bug reports', 'cat' => 'bugs'),
'acl_bug_post' => array('lang' => 'Can post bugs', 'cat' => 'post'), // Using a phpBB category here
));
-
- TODO:
- You are able to put your permission sets into a seperate file too by
- prefixing it with permissions_ and putting it into the acp language folder.
*/
// Define categories and permission types