[mxbb-commits] core common.php,1.116,1.117

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29751

Modified Files:
	common.php 
Log Message:


Index: common.php
===================================================================
RCS file: /cvsroot/mxbb/core/common.php,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** common.php	5 Jun 2013 14:05:57 -0000	1.116
--- common.php	16 Jun 2013 01:22:30 -0000	1.117
***************
*** 15,43 ****
  }
  
! //
! // To be able to include phpBB functions/methods
! //
  @define('IN_PHPBB', 1);
  @define('PHPBB_INSTALLED', true);
  
- 
- //
  // Reset stats
- //
  $mx_starttime = explode(' ', microtime());
  $mx_starttime = $mx_starttime[1] + $mx_starttime[0];
  
! //
! // DEBUG AND ERROR HANDLING
! //
  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
  
  // ================================================================================
--- 15,40 ----
  }
  
! /*
! * To be able to include phpBB functions/methods
! */
  @define('IN_PHPBB', 1);
  @define('PHPBB_INSTALLED', true);
  
  // Reset stats
  $mx_starttime = explode(' ', microtime());
  $mx_starttime = $mx_starttime[1] + $mx_starttime[0];
  
! /*
! * DEBUG AND ERROR HANDLING
! */
  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
  
  // ================================================================================
***************
*** 301,305 ****
  // Show 'Board is disabled' message if needed.
  //
! if($portal_config['board_disable'] && !defined("IN_ADMIN") && !defined("IN_LOGIN"))
  {
  	mx_message_die(GENERAL_MESSAGE, 'Board_disable', 'Information');
--- 298,302 ----
  // Show 'Board is disabled' message if needed.
  //
! if(!empty($portal_config['board_disable']) && !defined("IN_ADMIN") && !defined("IN_LOGIN"))
  {
  	mx_message_die(GENERAL_MESSAGE, 'Board_disable', 'Information');