phpbb-checkins

[Meik S. <acy...@ph...>]

Author: acydburn
Date: Mon Nov  9 16:49:15 2009
New Revision: 10263

Log:
merge r10262
Fix for r10255

Modified:
    branches/phpBB-3_0_6/phpBB/   (props changed)
    branches/phpBB-3_0_6/phpBB/styles/prosilver/template/forum_fn.js

Propchange: branches/phpBB-3_0_6/phpBB/
------------------------------------------------------------------------------
*** svn:mergeinfo (original)
--- svn:mergeinfo Mon Nov  9 16:49:15 2009
***************
*** 1 ****
! /branches/phpBB-3_0_0/phpBB:10260
--- 1 ----
! /branches/phpBB-3_0_0/phpBB:10260,10262

Modified: branches/phpBB-3_0_6/phpBB/styles/prosilver/template/forum_fn.js
==============================================================================
*** branches/phpBB-3_0_6/phpBB/styles/prosilver/template/forum_fn.js (original)
--- branches/phpBB-3_0_6/phpBB/styles/prosilver/template/forum_fn.js Mon Nov  9 16:49:15 2009
***************
*** 359,365 ****
  	if (!event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode))
  		event.which = event.charCode || event.keyCode;
  
! 	if (phpbb_set_autocomplete(event))
  		return true;
  
  	var current = selector['parentNode'];
--- 359,365 ----
  	if (!event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode))
  		event.which = event.charCode || event.keyCode;
  
! 	if (phpbb_check_key(event))
  		return true;
  
  	var current = selector['parentNode'];