[Phpbb-checkins] r10042 - in /branches/phpBB-3_0_0/phpBB: includes/acp/acp_logs.php includes/functions_admin.php includes/mcp/mcp_logs.php includes/mcp/mcp_notes.php language/en/acp/common.php

[Jim W. <ter...@ph...>]

Author: terrafrost
Date: Sat Aug 22 03:56:05 2009
New Revision: 10042

Log:
- accidentally undid changes introduced in r9979
- removed a few lines from the old log filtering system

Modified:
    branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php
    branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
    branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php
    branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_notes.php
    branches/phpBB-3_0_0/phpBB/language/en/acp/common.php

Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php Sat Aug 22 03:56:05 2009
***************
*** 140,146 ****
  			'S_LIMIT_DAYS'	=> $s_limit_days,
  			'S_SORT_KEY'	=> $s_sort_key,
  			'S_SORT_DIR'	=> $s_sort_dir,
- 			'S_LANG_KEYS'	=> $s_lang_keys,
  			'S_CLEARLOGS'	=> $auth->acl_get('a_clearlogs'),
  			'S_KEYWORDS'	=> $keywords,
  			)
--- 140,145 ----

Modified: branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_admin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_admin.php Sat Aug 22 03:56:05 2009
***************
*** 338,349 ****
  		return false;
  	}
  
! 	// Check if source forums exists
  	$sql = 'SELECT forum_name
  		FROM ' . FORUMS_TABLE . '
  		WHERE forum_id = ' . $src_forum_id;
  	$result = $db->sql_query($sql);
  	$src_forum_name = $db->sql_fetchfield('forum_name');
  
  	// Source forum doesn't exist
  	if (empty($src_forum_name))
--- 338,350 ----
  		return false;
  	}
  
! 	// Check if source forum exists
  	$sql = 'SELECT forum_name
  		FROM ' . FORUMS_TABLE . '
  		WHERE forum_id = ' . $src_forum_id;
  	$result = $db->sql_query($sql);
  	$src_forum_name = $db->sql_fetchfield('forum_name');
+ 	$db->sql_freeresult($result);
  
  	// Source forum doesn't exist
  	if (empty($src_forum_name))
***************
*** 357,362 ****
--- 358,364 ----
  		WHERE ' . $db->sql_in_set('forum_id', $dest_forum_ids);
  	$result = $db->sql_query($sql);
  
+ 	$dest_forum_ids = $dest_forum_names = array();
  	while ($row = $db->sql_fetchrow($result))
  	{
  		$dest_forum_ids[]	= (int) $row['forum_id'];

Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php Sat Aug 22 03:56:05 2009
***************
*** 184,190 ****
  			'S_SELECT_SORT_DIR'		=> $s_sort_dir,
  			'S_SELECT_SORT_KEY'		=> $s_sort_key,
  			'S_SELECT_SORT_DAYS'	=> $s_limit_days,
- 			'S_LANG_KEYS'			=> $s_lang_keys,
  			'S_LOGS'				=> ($log_count > 0),
  			'S_KEYWORDS'			=> $keywords,
  			)
--- 184,189 ----

Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_notes.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_notes.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_notes.php Sat Aug 22 03:56:05 2009
***************
*** 222,228 ****
  			'S_SELECT_SORT_DIR'		=> $s_sort_dir,
  			'S_SELECT_SORT_KEY'		=> $s_sort_key,
  			'S_SELECT_SORT_DAYS'	=> $s_limit_days,
- 			'S_LANG_KEYS'			=> $s_lang_keys,
  			'S_KEYWORDS'			=> $keywords,
  
  			'L_TITLE'			=> $user->lang['MCP_NOTES_USER'],
--- 222,227 ----

Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/common.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/common.php Sat Aug 22 03:56:05 2009
***************
*** 232,239 ****
  	'EXPORT_DOWNLOAD'		=> 'Download',
  	'EXPORT_STORE'			=> 'Store',
  
- 	'FILTER'				=> 'Filter',
- 
  	'GENERAL_OPTIONS'		=> 'General options',
  	'GENERAL_SETTINGS'		=> 'General settings',
  	'GLOBAL_MASK'			=> 'Global permission mask',
--- 232,237 ----
***************
*** 277,283 ****
  	'RETURN_TO'							=> 'Return to…',
  
  	'SELECT_ANONYMOUS'		=> 'Select anonymous user',
- 	'SELECT_LANG_KEY'		=> 'Select operation',
  	'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.',
--- 275,280 ----
***************
*** 311,318 ****
  
  	'DISPLAY_LOG'	=> 'Display entries from previous',
  
- 	'LOGS_PLACEHOLDER'	=> '<value>',
- 
  	'NO_ENTRIES'	=> 'No log entries for this period.',
  
  	'SORT_IP'		=> 'IP address',
--- 308,313 ----