|
From: Jon O. <jon...@us...> - 2008-07-10 20:46:41
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22493 Modified Files: mx_functions_phpbb.php mx_functions_style.php Log Message: Updated more generic initialization of styles and languages for backends. Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** mx_functions_style.php 9 Jul 2008 17:05:39 -0000 1.78 --- mx_functions_style.php 10 Jul 2008 20:46:36 -0000 1.79 *************** *** 20,24 **** include_once($mx_root_path . 'includes/sessions/'.PORTAL_BACKEND.'/session.' . $phpEx); ! // Abstract layer for Internal, phpBB2 or phpBB3 based session handling. class mx_session extends session { --- 20,29 ---- include_once($mx_root_path . 'includes/sessions/'.PORTAL_BACKEND.'/session.' . $phpEx); ! /** ! * Sessions [...1747 lines suppressed...] */ - /** - * Extend. - * - * Extend User Style with module lang and images. - * - * Usage: - * - $mx_user->extend(LANG, IMAGES) - * - * Switches: - * - LANG: MX_LANG_MAIN (default), MX_LANG_ADMIN, MX_LANG_ALL - * - IMAGES: MX_IMAGES (default), MX_NO_IMAGES - * - * @access public - * @param unknown_type $lang_mode - * @param unknown_type $image_mode - */ function extend($lang_mode = MX_LANG_MAIN, $image_mode = MX_IMAGES) { --- 1351,1354 ---- Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** mx_functions_phpbb.php 9 Jul 2008 14:53:55 -0000 1.71 --- mx_functions_phpbb.php 10 Jul 2008 20:46:36 -0000 1.72 *************** *** 261,265 **** } - //$default_lang = $mx_user->get_phpbb_lang($board_config['default_lang']); $default_lang = ($mx_user->lang['default_lang']) ? $mx_user->lang['default_lang'] : $board_config['default_lang']; --- 261,264 ---- *************** *** 402,406 **** $mx_page->init( $page_id ); ! $default_lang = ($mx_user->lang['default_lang']) ? $mx_user->get_phpbb_lang($mx_user->lang['default_lang']) : $board_config['default_lang']; if ( empty($default_lang) ) --- 401,405 ---- $mx_page->init( $page_id ); ! $default_lang = ($mx_user->lang['default_lang']) ? $mx_user->encode_lang($mx_user->lang['default_lang']) : $board_config['default_lang']; if ( empty($default_lang) ) |