|
From: Jon O. <jon...@us...> - 2008-06-16 08:30:34
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14455 Modified Files: mx_functions_bbcode.php mx_functions_phpbb.php mx_functions_tools.php Log Message: I've updated your bbcodes file, NO code updates, i have only reordered functions, so it's easier to file compare with original phpbb bbcode.php. Also, i have updated a few load_file() calls to ensure we are loading from phpbb2 shared folder. i know this is not needed with your standalone bbcodes, but for our own info. Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** mx_functions_phpbb.php 15 Jun 2008 22:44:07 -0000 1.63 --- mx_functions_phpbb.php 16 Jun 2008 08:30:26 -0000 1.64 *************** *** 1577,1581 **** { global $phpbb_root_path, $phpEx; ! include($phpbb_root_path . 'includes/bbcode.' . $phpEx); } --- 1577,1582 ---- { global $phpbb_root_path, $phpEx; ! mx_page::load_file('bbcode', 'phpbb3'); ! //include($phpbb_root_path . 'includes/bbcode.' . $phpEx); } Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** mx_functions_tools.php 16 Jun 2008 05:28:28 -0000 1.30 --- mx_functions_tools.php 16 Jun 2008 08:30:26 -0000 1.31 *************** *** 155,159 **** if (!class_exists('bbcode')) { ! mx_page::load_file('bbcode'); } --- 155,159 ---- if (!class_exists('bbcode')) { ! mx_page::load_file('bbcode', 'phpbb3'); } *************** *** 163,167 **** } */ - //require($mx_root_path . 'includes/shared/phpbb2/includes/bbcode.'.$phpEx); } --- 163,166 ---- Index: mx_functions_bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_bbcode.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mx_functions_bbcode.php 16 Jun 2008 05:28:28 -0000 1.5 --- mx_functions_bbcode.php 16 Jun 2008 08:30:25 -0000 1.6 *************** *** 15,426 **** } ! /** ! * phpBB Smilies pass. ! * ! * Hacking smilies_pass from phpbb/includes/bbcode.php ! * ! * @param string $message ! * @return string ! */ [...1092 lines suppressed...] + //What we do here with forum_id versus page_id ? + if ($mode == 'inline' && $display_link) + { + $template->assign_vars(array( + 'S_SHOW_SMILEY_LINK' => true, + 'U_MORE_SMILIES' => mx3_append_sid(PHPBB_URL . "posting.$phpEx", 'mode=smilies&f=' . $forum_id)) + ); + } + */ + break; + } + + if ($mode == 'window') + { + $template->pparse('smiliesbody'); + include($mx_root_path . 'includes/page_tail.'.$phpEx); + } + } ?> \ No newline at end of file |