Menu
▾
▴
[mxbb-commits] core/includes mx_functions_admincp.php, 1.55, 1.56 mx_functions_bbcode.php, 1.11, 1.12 mx_functions_core.php, 1.98, 1.99 mx_functions_tools.php, 1.39, 1.40
|
From: Jon O. <jon...@us...> - 2008-07-15 22:02:52
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21915/includes Modified Files: mx_functions_admincp.php mx_functions_bbcode.php mx_functions_core.php mx_functions_tools.php Log Message: More...of the same Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** mx_functions_core.php 13 Jul 2008 21:28:12 -0000 1.98 --- mx_functions_core.php 15 Jul 2008 22:02:45 -0000 1.99 *************** *** 164,170 **** * Examples * ! * mx_cache::load_file('functions_post'), will include the phpbb version of the file ! * mx_cache::load_file('functions_post', true), will include the shared phpbb version of the file ! * mx_cache::load_file('functions_post', 'phpbb2'), will include the shared phpbb2 version of the file, even though we are running in internal/phpbb3 mode * * @param unknown_type $file --- 164,170 ---- * Examples * ! * mx_cache::load_file('functions_x'), will include the phpbb version of the file ! * mx_cache::load_file('functions_x', true), will include the shared phpbb version of the file ! * mx_cache::load_file('functions_x', 'phpbb2'), will include the shared phpbb2 version of the file, even though we are running in internal/phpbb3 mode * * @param unknown_type $file *************** *** 2156,2160 **** function submit_parameters( $block_id = false ) { ! global $mx_request_vars, $db, $mx_cache, $lang, $userdata; $return = false; --- 2156,2160 ---- function submit_parameters( $block_id = false ) { ! global $mx_request_vars, $db, $mx_cache, $lang, $userdata, $mx_bbcode; $return = false; *************** *** 2180,2184 **** break; case 'BBText': ! $bbcode_uid = $parameter_opt = make_bbcode_uid(); $parameter_value = prepare_message($parameter_value, true, true, true, $bbcode_uid); break; --- 2180,2184 ---- break; case 'BBText': ! $bbcode_uid = $parameter_opt = $mx_bbcode->make_bbcode_uid(); $parameter_value = prepare_message($parameter_value, true, true, true, $bbcode_uid); break; Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** mx_functions_admincp.php 10 Jul 2008 23:02:05 -0000 1.55 --- mx_functions_admincp.php 15 Jul 2008 22:02:44 -0000 1.56 *************** *** 3128,3132 **** global $db, $phpbb_root_path, $board_config, $lang, $phpEx; ! mx_cache::load_file('functions_search', 'phpbb2'); $search_match_table = MX_MATCH_TABLE; --- 3128,3135 ---- global $db, $phpbb_root_path, $board_config, $lang, $phpEx; ! if( !function_exists('add_search_words') ) ! { ! mx_cache::load_file('functions_search', 'phpbb2'); ! } $search_match_table = MX_MATCH_TABLE; Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** mx_functions_tools.php 13 Jul 2008 21:28:13 -0000 1.39 --- mx_functions_tools.php 15 Jul 2008 22:02:45 -0000 1.40 *************** *** 1623,1631 **** // Includes // ! if( !function_exists('generate_smilies') ) { mx_cache::load_file('functions_post', 'phpbb2'); } /** * Class: mx_notification. --- 1623,1636 ---- // Includes // ! if( !function_exists('prepare_message') ) { mx_cache::load_file('functions_post', 'phpbb2'); } + if( !function_exists('add_search_words') ) + { + mx_cache::load_file('functions_search', 'phpbb2'); + } + /** * Class: mx_notification. *************** *** 3123,3131 **** // - // Includes - // - mx_cache::load_file('functions_search', 'phpbb2'); - - // // initialise some variables // --- 3128,3131 ---- *************** *** 3400,3405 **** global $userdata, $user_ip; - include($phpbb_root_path . 'includes/functions_search.'.$phpEx); - $forum_update_sql = "forum_posts = forum_posts - 1"; $topic_update_sql = ''; --- 3400,3403 ---- Index: mx_functions_bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_bbcode.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mx_functions_bbcode.php 13 Jul 2008 19:30:28 -0000 1.11 --- mx_functions_bbcode.php 15 Jul 2008 22:02:45 -0000 1.12 *************** *** 808,821 **** global $mx_page, $board_config, $phpbb_root_path, $phpEx; - if( !function_exists('generate_smilies') ) - { - mx_cache::load_file('functions_post', 'phpbb2'); - } - - if( !function_exists('smilies_pass') ) - { - mx_cache::load_file('bbcode', 'phpbb2'); - } - $smilies_path = $board_config['smilies_path']; $board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path']; --- 808,811 ---- |
