[Phpbb-checkins] CVS: phpBB2 privmsg.php,1.92,1.93

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv5197

Modified Files:
	privmsg.php 
Log Message:
Fix non-sending of email notifications ... user_active hadn't been added to the SQL query yet was being checked before email was sent

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -r1.92 -r1.93
*** privmsg.php	24 Mar 2002 13:54:09 -0000	1.92
--- privmsg.php	25 Mar 2002 13:22:46 -0000	1.93
***************
*** 31,35 ****
  // Is PM disabled?
  //
! if( !empty($board_config['privmsg_disable']) )
  {
  	message_die(GENERAL_MESSAGE, 'PM_disabled');
--- 31,35 ----
  // Is PM disabled?
  //
! if ( !empty($board_config['privmsg_disable']) )
  {
[...1679 lines suppressed...]
  			$msg_subject = preg_replace($orig_word, $replacement_word, $msg_subject);
--- 1990,1994 ----
  		$msg_subject = $pm_list[$i]['privmsgs_subject'];
  
! 		if ( count($orig_word) )
  		{
  			$msg_subject = preg_replace($orig_word, $replacement_word, $msg_subject);
***************
*** 2014,2018 ****
  		$msg_date = create_date($board_config['default_dateformat'], $pm_list[$i]['privmsgs_date'], $board_config['board_timezone']);
  
! 		if( $flag == PRIVMSGS_NEW_MAIL && $folder == "inbox" )
  		{
  			$msg_subject = "<b>" . $msg_subject . "</b>";
--- 1999,2003 ----
  		$msg_date = create_date($board_config['default_dateformat'], $pm_list[$i]['privmsgs_date'], $board_config['board_timezone']);
  
! 		if ( $flag == PRIVMSGS_NEW_MAIL && $folder == "inbox" )
  		{
  			$msg_subject = "<b>" . $msg_subject . "</b>";