From d5026a9f755ed961cf901e293e356e68e83dfce1 Mon Sep 17 00:00:00 2001 From: Carsten Wolff Date: Sun, 11 Apr 2004 09:03:56 +0000 Subject: [PATCH] make the use of adodb the default in the quote() and db_addslashes() functions, too --- phpgwapi/inc/class.db.inc.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/phpgwapi/inc/class.db.inc.php b/phpgwapi/inc/class.db.inc.php index 5ddb8741b1..761e8a4721 100644 --- a/phpgwapi/inc/class.db.inc.php +++ b/phpgwapi/inc/class.db.inc.php @@ -266,7 +266,8 @@ return ''; } // REMOVE-IF-ONLY-ADODB - if (!@$GLOBALS['phpgw_info']['server']['use_adodb']) + if (isset($GLOBALS['phpgw_info']['server']['use_adodb']) && + !@$GLOBALS['phpgw_info']['server']['use_adodb']) { return addslashes($str); } @@ -855,7 +856,8 @@ return (int) $value; } // REMOVE-IF-ONLY-ADODB - if (!@$GLOBALS['phpgw_info']['server']['use_adodb']) + if (isset($GLOBALS['phpgw_info']['server']['use_adodb']) && + !@$GLOBALS['phpgw_info']['server']['use_adodb']) { return "'" . (!isset($value) || $value == '' ? '' : addslashes($value)) . "'"; }