|
From: OryNider <ory...@us...> - 2008-02-09 11:29:12
|
Update of /cvsroot/mxbb/mx_pjirc/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7364/includes Modified Files: Tag: core28x common.php Log Message: mxBB -> Mx-Publisher Index: common.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/includes/common.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** common.php 9 Feb 2008 09:43:39 -0000 1.1.2.1 --- common.php 9 Feb 2008 11:29:08 -0000 1.1.2.2 *************** *** 39,66 **** define('PJIRC_SESSION_TABLE', $mx_table_prefix.'pjirc_session'); // // Load language files. // ! if( file_exists($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx) ) ! { ! include($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx); ! } ! else ! { ! include($module_root_path . 'language/lang_english/lang_admin.' . $phpEx); ! } ! if( file_exists($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx) ) { ! include($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx); } ! else { ! include($module_root_path . 'language/lang_english/lang_main.' . $phpEx); } // // Common definitions... // - $cfg_chatname = $board_config['sitename'] . ' -> ' . 'Pjirc'; --- 39,69 ---- define('PJIRC_SESSION_TABLE', $mx_table_prefix.'pjirc_session'); + $default_lang = ($mx_user->lang['default_lang']) ? $mx_user->lang['default_lang'] : $board_config['default_lang']; + // // Load language files. // ! if ((@include $module_root_path . "language/lang_" . $default_lang . "/lang_admin.$phpEx") === false) { ! if ((@include $module_root_path . "language/lang_english/lang_admin.$phpEx") === false) ! { ! mx_message_die(CRITICAL_ERROR, 'Language file ' . $module_root_path . "language/lang_" . $default_lang . "/lang_admin.$phpEx" . ' couldn\'t be opened.'); ! } } ! ! /* ! if ((@include $module_root_path . "language/lang_" . $default_lang . "/lang_main.$phpEx") === false) { ! if ((@include $module_root_path . "language/lang_english/lang_main.$phpEx") === false) ! { ! mx_message_die(CRITICAL_ERROR, 'Language file ' . $module_root_path . "language/lang_" . $default_lang . "/lang_main.$phpEx" . ' couldn\'t be opened.'); ! } } + */ + $mx_user->extend(MX_LANG_MAIN, MX_IMAGES_NONE); // // Common definitions... // $cfg_chatname = $board_config['sitename'] . ' -> ' . 'Pjirc'; *************** *** 81,85 **** if( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, "Couldn't query pjirc config table", "", __LINE__, __FILE__, $sql); } else --- 84,88 ---- if( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't query pjirc config table", "", __LINE__, __FILE__, $sql); } else |