[mxbb-commits] core/includes mx_functions_phpbb.php, 1.32.2.15, 1.32.2.16 mx_functions_tools.php, 1.15.2.6, 1.15.2.7

[Jon O. <jon...@us...>]

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

Modified Files:
      Tag: core28x
	mx_functions_phpbb.php mx_functions_tools.php 
Log Message:
Corrected what phpbb functions to include...

Index: mx_functions_phpbb.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v
retrieving revision 1.32.2.15
retrieving revision 1.32.2.16
diff -C2 -d -r1.32.2.15 -r1.32.2.16
*** mx_functions_phpbb.php	23 Feb 2008 19:38:24 -0000	1.32.2.15
--- mx_functions_phpbb.php	21 Mar 2008 20:05:16 -0000	1.32.2.16
***************
*** 15,18 ****
--- 15,25 ----
  }
  
+ //
+ // First off, include common vanilla phpBB functions, from our shared dir
+ // Note: These functions will later be accessible wrapped as phpBBX::orig_functionname()
+ //
+ include($mx_root_path . 'includes/shared/phpbb2/includes/functions.' . $phpEx);
+ include_once($phpbb_root_path . 'includes/functions.' . $phpEx); // In case we need old functions...
+ 
  /**
   * phpBB Smilies pass.

Index: mx_functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v
retrieving revision 1.15.2.6
retrieving revision 1.15.2.7
diff -C2 -d -r1.15.2.6 -r1.15.2.7
*** mx_functions_tools.php	18 Feb 2008 20:20:08 -0000	1.15.2.6
--- mx_functions_tools.php	21 Mar 2008 20:05:17 -0000	1.15.2.7
***************
*** 2033,2043 ****
  			//$this->temp_url = PORTAL_URL . this_kb_mxurl("mode=" . "article&k=" . $this->data['item_id'], false, true);
  
! 			$this->auto_message = "<br /><b>" . $this->langs['item_title'] . ":</b> " . $this->data['item_title'] . "<br />";
! 			$this->auto_message .= "<b>" . $this->langs['author'] . ":</b> " . $this->data['item_author'] . "<br />";
! 			$this->auto_message .= "<b>" . $this->langs['item_description'] . ":</b> <i>" . $this->data['item_desc'] . "</i><br />";
  
  			if ($action != MX_DELETED_NOTIFICATION)
  			{
! 				$this->auto_message .= "<br /><b><a href=\"" . $this->temp_url . "\">" . $this->langs['read_full_item'] . "</a></b>";
  			}
  
--- 2033,2043 ----
  			//$this->temp_url = PORTAL_URL . this_kb_mxurl("mode=" . "article&k=" . $this->data['item_id'], false, true);
  
! 			$this->auto_message = $this->langs['item_title'] . ":  " . $this->data['item_title'] . "\n";
! 			$this->auto_message .= $this->langs['author'] . ": " . $this->data['item_author'] . "\n";
! 			$this->auto_message .= $this->langs['item_description'] . ": " . $this->data['item_desc'] . "\n";
  
  			if ($action != MX_DELETED_NOTIFICATION)
  			{
! 				$this->auto_message .= "\n" . $this->langs['read_full_item'] . ": \n" . $this->temp_url . "\n";
  			}
  
***************
*** 2045,2049 ****
  			// Update message
  			//
! 			$this->auto_message_update = "<br /><i>" . $this->langs['edited_item_info'] . $this->data['item_editor'] . "</i>" . "<br />";
  
  			//
--- 2045,2049 ----
  			// Update message
  			//
! 			$this->auto_message_update = $this->langs['edited_item_info'] . $this->data['item_editor'] . "\n";
  
  			//