diff options
| author | Damien Regad <dregad@mantisbt.org> | 2019-05-08 16:54:38 +0200 |
|---|---|---|
| committer | Damien Regad <dregad@mantisbt.org> | 2019-05-08 16:54:38 +0200 |
| commit | f4c781acd7ab8f3de5419ae7460498d5793a776a (patch) | |
| tree | a13e79fb06194bc58d65815742b12306238a0cef /adodb-active-recordx.inc.php | |
| parent | df14884a8cb49f6d86085785de20bd535db5472f (diff) | |
| parent | 2b09c6d448267b32534b16a9aa4e9b2e62db0ed0 (diff) | |
| download | adodb-f4c781acd7ab8f3de5419ae7460498d5793a776a.tar.gz adodb-f4c781acd7ab8f3de5419ae7460498d5793a776a.tar.bz2 adodb-f4c781acd7ab8f3de5419ae7460498d5793a776a.zip | |
Merge branch 'hotfix/5.20'
# Conflicts:
# docs/changelog.md
Diffstat (limited to 'adodb-active-recordx.inc.php')
| -rw-r--r-- | adodb-active-recordx.inc.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/adodb-active-recordx.inc.php b/adodb-active-recordx.inc.php index 3943c0b2..36741300 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,8 +491,8 @@ class ADODB_Active_Record { $attr = array(); $keys = array(); - switch($ADODB_ASSOC_CASE) { - case 0: + switch (ADODB_ASSOC_CASE) { + case ADODB_ASSOC_CASE_LOWER: foreach($cols as $name => $fldobj) { $name = strtolower($name); if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) { @@ -508,7 +508,7 @@ class ADODB_Active_Record { } break; - case 1: + case ADODB_ASSOC_CASE_UPPER: foreach($cols as $name => $fldobj) { $name = strtoupper($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) { case ADODB_ASSOC_CASE_LOWER: foreach($pkey as $k => $v) { $pkey[$k] = strtolower($v); |