[mxbb-commits] core common.php,1.110,1.111

[FlorinCB <ory...@us...>]

Update of /cvsroot/mxbb/core
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22271

Modified Files:
	common.php 
Log Message:
update

Index: common.php
===================================================================
RCS file: /cvsroot/mxbb/core/common.php,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** common.php	8 Jul 2009 19:25:07 -0000	1.110
--- common.php	29 Jul 2009 06:31:37 -0000	1.111
***************
*** 33,39 ****
  define('DEBUG', true); // [Admin Option] Show Footer debug stats - Actually set in phpBB/includes/constants.php
  define('DEBUG_EXTRA', true); // [Admin Option] Show memory usage. Show link to full SQL debug report in footer. Beware, this makes the page slow to load. For debugging only.
  @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+
  include($mx_root_path . 'modules/mx_shared/ErrorHandler/prepend.' . $phpEx); // For nice error output
  
--- 33,42 ----
  define('DEBUG', true); // [Admin Option] Show Footer debug stats - Actually set in phpBB/includes/constants.php
  define('DEBUG_EXTRA', true); // [Admin Option] Show memory usage. Show link to full SQL debug report in footer. Beware, this makes the page slow to load. For debugging only.
+ define('INCLUDES', 'includes/'); //Main Includes folder
  @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
  
***************
*** 200,207 ****
  // MX-Publisher CORE Includes
  //
! include_once($mx_root_path . 'includes/mx_constants.' . $phpEx); // Also includes phpBB constants
! include_once($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class
! include_once($mx_root_path . 'includes/utf/utf_tools.' . $phpEx); //Load UTF-8 Tools
! include_once($mx_root_path . 'includes/mx_functions_core.' . $phpEx); // CORE class
  
  //
--- 203,210 ----
  // MX-Publisher CORE Includes
  //
! include_once($mx_root_path . INCLUDES . 'mx_constants.' . $phpEx); // Also includes phpBB constants
! include_once($mx_root_path . INCLUDES . 'db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class
! include_once($mx_root_path . INCLUDES . 'utf/utf_tools.' . $phpEx); //Load UTF-8 Tools
! include_once($mx_root_path . INCLUDES . 'mx_functions_core.' . $phpEx); // CORE class
  
  //
***************
*** 230,235 ****
  // MX-Publisher Includes - doing the rest
  //
! include_once($mx_root_path . 'includes/mx_functions.' . $phpEx); // CORE Functions
! include_once($mx_root_path . 'includes/mx_functions_style.' . $phpEx); // Styling and sessions
  
  // We do not need this any longer, unset for safety purposes
--- 233,238 ----
  // MX-Publisher Includes - doing the rest
  //
! include_once($mx_root_path . INCLUDES . 'mx_functions.' . $phpEx); // CORE Functions
! include_once($mx_root_path . INCLUDES . 'mx_functions_style.' . $phpEx); // Styling and sessions
  
  // We do not need this any longer, unset for safety purposes