makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- accidentally undid changes introduced in r9979

Browse source 
- removed a few lines from the old log filtering system

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10042 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Jim Wigginton 2009-08-22 02:56:05 +00:00
parent 69aa05376b
commit 70c4e48b39
5 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/includes/acp/acp_logs.php
View file

@ -140,7 +140,6 @@ class acp_logs
'S_LIMIT_DAYS' => $s_limit_days, 'S_LIMIT_DAYS' => $s_limit_days,
'S_SORT_KEY' => $s_sort_key, 'S_SORT_KEY' => $s_sort_key,
'S_SORT_DIR' => $s_sort_dir, 'S_SORT_DIR' => $s_sort_dir,
'S_LANG_KEYS' => $s_lang_keys,
'S_CLEARLOGS' => $auth->acl_get('a_clearlogs'), 'S_CLEARLOGS' => $auth->acl_get('a_clearlogs'),
'S_KEYWORDS' => $keywords, 'S_KEYWORDS' => $keywords,
) )

4
phpBB/includes/functions_admin.php
View file

@ -338,12 +338,13 @@ function copy_forum_permissions($src_forum_id, $dest_forum_ids, $clear_dest_perm
return false; return false;
} }
// Check if source forums exists // Check if source forum exists
$sql = 'SELECT forum_name $sql = 'SELECT forum_name
FROM ' . FORUMS_TABLE . ' FROM ' . FORUMS_TABLE . '
WHERE forum_id = ' . $src_forum_id; WHERE forum_id = ' . $src_forum_id;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$src_forum_name = $db->sql_fetchfield('forum_name'); $src_forum_name = $db->sql_fetchfield('forum_name');
$db->sql_freeresult($result);
// Source forum doesn't exist // Source forum doesn't exist
if (empty($src_forum_name)) if (empty($src_forum_name))
@ -357,6 +358,7 @@ function copy_forum_permissions($src_forum_id, $dest_forum_ids, $clear_dest_perm
WHERE ' . $db->sql_in_set('forum_id', $dest_forum_ids); WHERE ' . $db->sql_in_set('forum_id', $dest_forum_ids);
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$dest_forum_ids = $dest_forum_names = array();
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$dest_forum_ids[] = (int) $row['forum_id']; $dest_forum_ids[] = (int) $row['forum_id'];

1
phpBB/includes/mcp/mcp_logs.php
View file

@ -184,7 +184,6 @@ class mcp_logs
'S_SELECT_SORT_DIR' => $s_sort_dir, 'S_SELECT_SORT_DIR' => $s_sort_dir,
'S_SELECT_SORT_KEY' => $s_sort_key, 'S_SELECT_SORT_KEY' => $s_sort_key,
'S_SELECT_SORT_DAYS' => $s_limit_days, 'S_SELECT_SORT_DAYS' => $s_limit_days,
'S_LANG_KEYS' => $s_lang_keys,
'S_LOGS' => ($log_count > 0), 'S_LOGS' => ($log_count > 0),
'S_KEYWORDS' => $keywords, 'S_KEYWORDS' => $keywords,
) )

1
phpBB/includes/mcp/mcp_notes.php
View file

@ -222,7 +222,6 @@ class mcp_notes
'S_SELECT_SORT_DIR' => $s_sort_dir, 'S_SELECT_SORT_DIR' => $s_sort_dir,
'S_SELECT_SORT_KEY' => $s_sort_key, 'S_SELECT_SORT_KEY' => $s_sort_key,
'S_SELECT_SORT_DAYS' => $s_limit_days, 'S_SELECT_SORT_DAYS' => $s_limit_days,
'S_LANG_KEYS' => $s_lang_keys,
'S_KEYWORDS' => $keywords, 'S_KEYWORDS' => $keywords,
'L_TITLE' => $user->lang['MCP_NOTES_USER'], 'L_TITLE' => $user->lang['MCP_NOTES_USER'],

5
phpBB/language/en/acp/common.php
View file

@ -232,8 +232,6 @@ $lang = array_merge($lang, array(
'EXPORT_DOWNLOAD' => 'Download', 'EXPORT_DOWNLOAD' => 'Download',
'EXPORT_STORE' => 'Store', 'EXPORT_STORE' => 'Store',
'FILTER' => 'Filter',
'GENERAL_OPTIONS' => 'General options', 'GENERAL_OPTIONS' => 'General options',
'GENERAL_SETTINGS' => 'General settings', 'GENERAL_SETTINGS' => 'General settings',
'GLOBAL_MASK' => 'Global permission mask', 'GLOBAL_MASK' => 'Global permission mask',
@ -277,7 +275,6 @@ $lang = array_merge($lang, array(
'RETURN_TO' => 'Return to…', 'RETURN_TO' => 'Return to…',
'SELECT_ANONYMOUS' => 'Select anonymous user', 'SELECT_ANONYMOUS' => 'Select anonymous user',
'SELECT_LANG_KEY' => 'Select operation',
'SELECT_OPTION' => 'Select option', 'SELECT_OPTION' => 'Select option',
'SETTING_TOO_LOW' => 'The entered value for the setting “%1$s” is too low. The minimal allowed value is %2$d.', 'SETTING_TOO_LOW' => 'The entered value for the setting “%1$s” is too low. The minimal allowed value is %2$d.',
@ -311,8 +308,6 @@ $lang = array_merge($lang, array(
'DISPLAY_LOG' => 'Display entries from previous', 'DISPLAY_LOG' => 'Display entries from previous',
'LOGS_PLACEHOLDER' => '<value>',
'NO_ENTRIES' => 'No log entries for this period.', 'NO_ENTRIES' => 'No log entries for this period.',
'SORT_IP' => 'IP address', 'SORT_IP' => 'IP address',