Index: trunk/kernel/include/adodb/adodb.inc.php =================================================================== diff -u -r4814 -r4880 --- trunk/kernel/include/adodb/adodb.inc.php (.../adodb.inc.php) (revision 4814) +++ trunk/kernel/include/adodb/adodb.inc.php (.../adodb.inc.php) (revision 4880) @@ -724,9 +724,8 @@ ADOConnection::outp( "=----\n($this->databaseType): ".($sqlTxt)." \n-----\n",false); flush(); - $profileSQLs = dbg_ConstOn('DBG_SQL_PROFILE'); - if($profileSQLs) - { + $profileSQLs = constOn('DBG_SQL_PROFILE'); + if ($profileSQLs) { $isSkipTable = isSkipTable($sql); $queryID = $debugger->generateID(); if(!$isSkipTable) $debugger->profileStart('sql_'.$queryID, $debugger->formatSQL($sql) ); @@ -756,12 +755,12 @@ $e = $this->ErrorNo(); $m = $this->ErrorMsg(); - $errorLevel = dbg_ConstOn('DBG_SQL_FAILURE') && !dbg_ConstOn('IS_INSTALL') ? E_USER_ERROR : E_USER_WARNING; + $errorLevel = constOn('DBG_SQL_FAILURE') && !constOn('IS_INSTALL') ? E_USER_ERROR : E_USER_WARNING; $debugger->dumpVars($_REQUEST); $debugger->appendTrace(); $error_msg = ''.$m.' ('.$e.')
SQL: '.$debugger->formatSQL($sql); - $long_id=$debugger->mapLongError($error_msg); + $long_id = $debugger->mapLongError($error_msg); trigger_error( substr($m.' ('.$e.') ['.$sql.']',0,1000).' #'.$long_id, $errorLevel); ADOConnection::outp($e .': '. $m );