diff options
| -rw-r--r-- | adodb-active-record.inc.php | 10 | ||||
| -rw-r--r-- | adodb-active-recordx.inc.php | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/adodb-active-record.inc.php b/adodb-active-record.inc.php index 13ce8c2a..6d92a906 100644 --- a/adodb-active-record.inc.php +++ b/adodb-active-record.inc.php @@ -120,7 +120,7 @@ class ADODB_Active_Record { // php5 constructor function __construct($table = false, $pkeyarr=false, $db=false) { - global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS; + global $_ADODB_ACTIVE_DBS; if ($db == false && is_object($pkeyarr)) { $db = $pkeyarr; @@ -374,7 +374,7 @@ class ADODB_Active_Record { // update metadata function UpdateActiveTable($pkeys=false,$forceUpdate=false) { - global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS , $ADODB_CACHE_DIR, $ADODB_ACTIVE_CACHESECS; + global $_ADODB_ACTIVE_DBS , $ADODB_CACHE_DIR, $ADODB_ACTIVE_CACHESECS; global $ADODB_ACTIVE_DEFVALS,$ADODB_FETCH_MODE; $activedb = $_ADODB_ACTIVE_DBS[$this->_dbat]; @@ -927,8 +927,6 @@ class ADODB_Active_Record { // returns 0 on error, 1 on update, 2 on insert function Replace() { - global $ADODB_ASSOC_CASE; - $db = $this->DB(); if (!$db) { return false; @@ -968,11 +966,11 @@ class ADODB_Active_Record { $pkey = array($pkey); } - if ($ADODB_ASSOC_CASE == 0) { + if (ADODB_ASSOC_CASE == 0) { foreach($pkey as $k => $v) $pkey[$k] = strtolower($v); } - elseif ($ADODB_ASSOC_CASE == 1) { + elseif (ADODB_ASSOC_CASE == 1) { foreach($pkey as $k => $v) { $pkey[$k] = strtoupper($v); } diff --git a/adodb-active-recordx.inc.php b/adodb-active-recordx.inc.php index 0d85a744..9fd593ce 100644 --- a/adodb-active-recordx.inc.php +++ b/adodb-active-recordx.inc.php @@ -137,7 +137,7 @@ class ADODB_Active_Record { // if $options['new'] is true, we forget all relations function __construct($table = false, $pkeyarr=false, $db=false, $options=array()) { - global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS; + global $_ADODB_ACTIVE_DBS; if ($db == false && is_object($pkeyarr)) { $db = $pkeyarr; @@ -410,7 +410,7 @@ class ADODB_Active_Record { // update metadata function UpdateActiveTable($pkeys=false,$forceUpdate=false) { - global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS , $ADODB_CACHE_DIR, $ADODB_ACTIVE_CACHESECS; + global $_ADODB_ACTIVE_DBS , $ADODB_CACHE_DIR, $ADODB_ACTIVE_CACHESECS; global $ADODB_ACTIVE_DEFVALS, $ADODB_FETCH_MODE; $activedb = $_ADODB_ACTIVE_DBS[$this->_dbat]; @@ -491,7 +491,7 @@ class ADODB_Active_Record { $attr = array(); $keys = array(); - switch($ADODB_ASSOC_CASE) { + switch (ADODB_ASSOC_CASE) { case 0: foreach($cols as $name => $fldobj) { $name = strtolower($name); @@ -1060,8 +1060,6 @@ class ADODB_Active_Record { // returns 0 on error, 1 on update, 2 on insert function Replace() { - global $ADODB_ASSOC_CASE; - $db = $this->DB(); if (!$db) { return false; @@ -1097,7 +1095,7 @@ class ADODB_Active_Record { } - switch ($ADODB_ASSOC_CASE == 0) { + switch (ADODB_ASSOC_CASE == 0) { case ADODB_ASSOC_CASE_LOWER: foreach($pkey as $k => $v) { $pkey[$k] = strtolower($v); |