|
From: Florin C B. <ory...@us...> - 2014-05-09 07:51:44
|
Update of /cvsroot/mxbb/core In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32488 Modified Files: common.php index.php Log Message: some fixes to the internal BACKEND, plus some support for other backends compatible in the future versions Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.120 retrieving revision 1.121 diff -C2 -d -r1.120 -r1.121 *** common.php 4 May 2014 22:36:14 -0000 1.120 --- common.php 9 May 2014 07:51:42 -0000 1.121 *************** *** 33,40 **** @ini_set('display_errors', '1'); //@error_reporting(E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables ! @error_reporting(E_ALL & ~E_NOTICE); //Default error reporting in PHP 5.2+ //@session_cache_expire (1440); //@set_time_limit (0); ! include($mx_root_path . 'modules/mx_shared/ErrorHandler/prepend.' . $phpEx); // For nice error output // ================================================================================ --- 33,40 ---- @ini_set('display_errors', '1'); //@error_reporting(E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables ! //@error_reporting(E_ALL & ~E_NOTICE); //Default error reporting in PHP 5.2+ //@session_cache_expire (1440); //@set_time_limit (0); ! //include($mx_root_path . 'modules/mx_shared/ErrorHandler/prepend.' . $phpEx); // For nice error output // ================================================================================ Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/index.php,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** index.php 26 Jun 2013 09:15:22 -0000 1.87 --- index.php 9 May 2014 07:51:42 -0000 1.88 *************** *** 194,203 **** { $module_root_path = $mx_root_path . $mx_block->module_root_path; ! //this will fix the path if ((@include $module_root_path . $mx_block->block_file) === false) { ! $module_root_path = $mx_block->module_root_path; ! include($module_root_path . $mx_block->block_file); ! } } $mx_block->block_contents = ob_get_contents(); --- 194,206 ---- { $module_root_path = $mx_root_path . $mx_block->module_root_path; ! //this will fix the path if ((@include $module_root_path . $mx_block->block_file) === false) { ! $module_root_path = $mx_block->module_root_path; ! if (!is_dir($module_root_path . $mx_block->block_file . '/')) ! { ! include($module_root_path . $mx_block->block_file); ! } ! } } $mx_block->block_contents = ob_get_contents(); |