mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-15 05:04:09 +02:00
Code Issues Releases Wiki Activity

fixing some bugs, most being submitted grammatical/spelling errors.

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@6915 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-01-21 18:33:45 +00:00
parent 61d4209aaf
commit 576bb754e9
58 changed files with 132 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/acp/acp_board.php
View File

@@ -153,7 +153,7 @@ class acp_board
'bump_interval' => array('lang' => 'BUMP_INTERVAL', 'validate' => 'int', 'type' => 'custom', 'method' => 'bump_interval', 'explain' => true),
'topics_per_page' => array('lang' => 'TOPICS_PER_PAGE', 'validate' => 'int', 'type' => 'text:3:4', 'explain' => false),
'posts_per_page' => array('lang' => 'POSTS_PER_PAGE', 'validate' => 'int', 'type' => 'text:3:4', 'explain' => false),
'hot_threshold' => array('lang' => 'HOT_THRESHOLD', 'validate' => 'int', 'type' => 'text:3:4', 'explain' => false),
'hot_threshold' => array('lang' => 'HOT_THRESHOLD', 'validate' => 'int', 'type' => 'text:3:4', 'explain' => true),
'max_poll_options' => array('lang' => 'MAX_POLL_OPTIONS', 'validate' => 'int', 'type' => 'text:4:4', 'explain' => false),
'max_post_chars' => array('lang' => 'CHAR_LIMIT', 'validate' => 'int', 'type' => 'text:4:6', 'explain' => true),
'max_post_smilies' => array('lang' => 'SMILIES_LIMIT', 'validate' => 'int', 'type' => 'text:4:4', 'explain' => true),

2
phpBB/includes/acp/acp_email.php
View File

@@ -38,7 +38,7 @@ class acp_email
{
// Error checking needs to go here ... if no subject and/or no message then skip
// over the send and return to the form
$use_queue = (isset($_POST['send_immediatly'])) ? false : true;
$use_queue = (isset($_POST['send_immediately'])) ? false : true;
$priority = request_var('mail_priority_flag', MAIL_NORMAL_PRIORITY);
if (!$subject)

4
phpBB/includes/acp/acp_forums.php
View File

@@ -403,10 +403,8 @@ class acp_forums
}
// Make sure no direct child forums are able to be selected as parents.
$childs = get_forum_branch($forum_id, 'children');
$exclude_forums = array();
foreach ($childs as $row)
foreach (get_forum_branch($forum_id, 'children') as $row)
{
$exclude_forums[] = $row['forum_id'];
}

2
phpBB/includes/acp/acp_groups.php
View File

@@ -381,7 +381,7 @@ class acp_groups
$group_perm_from = request_var('group_perm_from', 0);
// Copy permissions?
// If the user has the a_authgroups permission and at least one additional permission ability set the permissions are fully transfered.
// If the user has the a_authgroups permission and at least one additional permission ability set the permissions are fully transferred.
// We do not limit on one auth category because this can lead to incomplete permissions being tricky to fix for the admin, roles being assigned or added non-default permissions.
// Since the user only has the option to copy permissions from non leader managed groups this seems to be a good compromise.
if ($group_perm_from && $action == 'add' && $auth->acl_get('a_authgroups') && $auth->acl_gets('a_aauth', 'a_fauth', 'a_mauth', 'a_uauth'))

2
phpBB/includes/acp/acp_main.php
View File

@@ -43,7 +43,7 @@ class acp_main
'S_RESTORE_PERMISSIONS' => true,
'U_RESTORE_PERMISSIONS' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm'),
'PERM_FROM' => $perm_from,
'L_PERMISSIONS_TRANSFERED_EXPLAIN' => sprintf($user->lang['PERMISSIONS_TRANSFERED_EXPLAIN'], $perm_from, append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm')),
'L_PERMISSIONS_TRANSFERRED_EXPLAIN' => sprintf($user->lang['PERMISSIONS_TRANSFERRED_EXPLAIN'], $perm_from, append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm')),
));
return;

8
phpBB/includes/acp/acp_modules.php
View File

@@ -1025,14 +1025,6 @@ class acp_modules
return $this->lang_name($target['module_langname']);
}
/**
* Check if the module or her childs hold the management module(s)
*/
function is_management_module($module_id)
{
}
}
?>

2
phpBB/includes/acp/acp_search.php
View File

@@ -532,7 +532,7 @@ class acp_search
/**
* Initialises a search backend object
*
* @return false if no error occured else an error message
* @return false if no error occurred else an error message
*/
function init_search($type, &$search, &$error)
{

6
phpBB/includes/acp/acp_styles.php
View File

@@ -2095,7 +2095,7 @@ parse_css_file = {PARSE_CSS_FILE}
);
}
// User has submitted form and no errors have occured
// User has submitted form and no errors have occurred
if ($update && !sizeof($error))
{
$sql_ary = array(
@@ -2558,7 +2558,7 @@ parse_css_file = {PARSE_CSS_FILE}
$style_row['style_active'] = request_var('style_active', 1);
$style_row['style_default'] = request_var('style_default', 0);
// User has submitted form and no errors have occured
// User has submitted form and no errors have occurred
if ($update && !sizeof($error))
{
if ($mode == 'style')
@@ -2693,7 +2693,7 @@ parse_css_file = {PARSE_CSS_FILE}
}
}
// User has submitted form and no errors have occured
// User has submitted form and no errors have occurred
if ($update && !sizeof($error))
{
if ($mode == 'style')