[mxbb-commits] core/includes/shared/phpbb3/includes message_parser.php, 1.4, 1.5

[FlorinCB <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3405

Modified Files:
	message_parser.php 
Log Message:
prefixed some functions with phpBB3::

Index: message_parser.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/message_parser.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** message_parser.php	10 Jul 2008 23:02:07 -0000	1.4
--- message_parser.php	3 Sep 2008 23:48:58 -0000	1.5
***************
*** 1211,1215 ****
  		}
  
! 		($custom_bbcode_uid) ? decode_message($this->message, $custom_bbcode_uid) : decode_message($this->message, $this->bbcode_uid);
  
  		if (!$update_this_message)
--- 1211,1215 ----
  		}
  
! 		($custom_bbcode_uid) ? phpBB3::decode_message($this->message, $custom_bbcode_uid) : phpBB3::decode_message($this->message, $this->bbcode_uid);
  
  		if (!$update_this_message)
***************
*** 1319,1323 ****
  
  		$num_attachments = sizeof($this->attachment_data);
! 		$this->filename_data['filecomment'] = utf8_normalize_nfc(request_var('filecomment', '', true));
  		$upload_file = (isset($_FILES[$form_name]) && $_FILES[$form_name]['name'] != 'none' && trim($_FILES[$form_name]['name'])) ? true : false;
  
--- 1319,1323 ----
  
  		$num_attachments = sizeof($this->attachment_data);
! 		$this->filename_data['filecomment'] = utf8_normalize_nfc(phpBB3::request_var('filecomment', '', true));
  		$upload_file = (isset($_FILES[$form_name]) && $_FILES[$form_name]['name'] != 'none' && trim($_FILES[$form_name]['name'])) ? true : false;
  
***************
*** 1326,1330 ****
  
  		// First of all adjust comments if changed
! 		$actual_comment_list = utf8_normalize_nfc(request_var('comment_list', array(''), true));
  
  		foreach ($actual_comment_list as $comment_key => $comment)
--- 1326,1330 ----
  
  		// First of all adjust comments if changed
! 		$actual_comment_list = utf8_normalize_nfc(phpBB3::request_var('comment_list', array(''), true));
  
  		foreach ($actual_comment_list as $comment_key => $comment)
***************
*** 1406,1410 ****
  				include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
  
! 				$index = array_keys(request_var('delete_file', array(0 => 0)));
  				$index = (!empty($index)) ? $index[0] : false;
  
--- 1406,1410 ----
  				include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
  
! 				$index = array_keys(phpBB3::request_var('delete_file', array(0 => 0)));
  				$index = (!empty($index)) ? $index[0] : false;
  
***************
*** 1504,1508 ****
  		global $mx_user, $db, $phpbb_root_path, $phpEx, $board_config;
  
! 		$this->filename_data['filecomment'] = utf8_normalize_nfc(request_var('filecomment', '', true));
  		$attachment_data = (isset($_POST['attachment_data'])) ? $_POST['attachment_data'] : array();
  		$this->attachment_data = array();
--- 1504,1508 ----
  		global $mx_user, $db, $phpbb_root_path, $phpEx, $board_config;
  
! 		$this->filename_data['filecomment'] = utf8_normalize_nfc(phpBB3::request_var('filecomment', '', true));
  		$attachment_data = (isset($_POST['attachment_data'])) ? $_POST['attachment_data'] : array();
  		$this->attachment_data = array();