# HG changeset patch # User Dan # Date 1204862685 18000 # Node ID 2cb1c8a6d3db6fe48a2d2fe0f1f4d585da876bfd # Parent 647d11c5e9c1e755d6ce451f8b4a76e7e963439e Added safety against re-defining constants in dbal diff -r 647d11c5e9c1 -r 2cb1c8a6d3db includes/dbal.php --- a/includes/dbal.php Thu Mar 06 22:48:16 2008 -0500 +++ b/includes/dbal.php Thu Mar 06 23:04:45 2008 -0500 @@ -131,11 +131,15 @@ { $this->enable_errorhandler(); - define('ENANO_DBLAYER', 'MYSQL'); - define('ENANO_SQLFUNC_LOWERCASE', 'lcase'); - define('ENANO_SQL_MULTISTRING_PRFIX', ''); - define('ENANO_SQL_BOOLEAN_TRUE', 'true'); - define('ENANO_SQL_BOOLEAN_FALSE', 'false'); + if ( !defined('ENANO_SQL_CONSTANTS') ) + { + define('ENANO_SQL_CONSTANTS', ''); + define('ENANO_DBLAYER', 'MYSQL'); + define('ENANO_SQLFUNC_LOWERCASE', 'lcase'); + define('ENANO_SQL_MULTISTRING_PRFIX', ''); + define('ENANO_SQL_BOOLEAN_TRUE', 'true'); + define('ENANO_SQL_BOOLEAN_FALSE', 'false'); + } if ( !$manual_credentials ) { @@ -907,11 +911,15 @@ { $this->enable_errorhandler(); - define('ENANO_DBLAYER', 'PGSQL'); - define('ENANO_SQLFUNC_LOWERCASE', 'lower'); - define('ENANO_SQL_MULTISTRING_PRFIX', 'E'); - define('ENANO_SQL_BOOLEAN_TRUE', '1'); - define('ENANO_SQL_BOOLEAN_FALSE', '0'); + if ( !defined('ENANO_SQL_CONSTANTS') ) + { + define('ENANO_SQL_CONSTANTS', ''); + define('ENANO_DBLAYER', 'PGSQL'); + define('ENANO_SQLFUNC_LOWERCASE', 'lower'); + define('ENANO_SQL_MULTISTRING_PRFIX', 'E'); + define('ENANO_SQL_BOOLEAN_TRUE', '1'); + define('ENANO_SQL_BOOLEAN_FALSE', '0'); + } if ( !$manual_credentials ) {