[mxbb-commits] core/includes mx_functions_core.php, 1.58, 1.59 mx_functions_phpbb.php, 1.37, 1.38 mx_functions_style.php, 1.31, 1.32

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

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

Modified Files:
	mx_functions_core.php mx_functions_phpbb.php 
	mx_functions_style.php 
Log Message:
smilies

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** mx_functions_core.php	13 Jan 2008 18:36:28 -0000	1.58
--- mx_functions_core.php	15 Jan 2008 10:53:13 -0000	1.59
***************
*** 107,115 ****
  	 * @return unknown
  	 */
! 	function obtain_mxbb_config()
  	{
  		global $db;
  
! 		if ($config = $this->get('mxbb_config') && $portal_config['portal_version'])
  		{
  			return $config;
--- 107,115 ----
  	 * @return unknown
  	 */
! 	function obtain_mxbb_config($force_refresh = false)
  	{
  		global $db;
  
! 		if ( ($config = $this->get('mxbb_config')) && !($force_refresh) )
  		{
  			return $config;


Index: mx_functions_phpbb.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** mx_functions_phpbb.php	13 Jan 2008 21:42:25 -0000	1.37
--- mx_functions_phpbb.php	15 Jan 2008 10:53:13 -0000	1.38
***************
*** 145,148 ****
--- 145,149 ----
   * @return string
   */
+ 
  function mx_smilies_pass_old($message)
  {
***************
*** 154,157 ****
--- 155,163 ----
  	}
  
+ 	if( !function_exists('smilies_pass') && ((PORTAL_BACKEND == 'phpbb2') || (PORTAL_BACKEND == 'phpBB2')) )
+ 	{
+ 		include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx);
+ 	}
+ 
  	$smilies_path = $board_config['smilies_path'];
  	$board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path'];
***************
*** 161,164 ****
--- 167,171 ----
  }
  
+ 
  /**
   * phpBB Smilies pass.