diff options
| author | Damien Regad <dregad@mantisbt.org> | 2019-05-08 14:41:35 +0200 |
|---|---|---|
| committer | Damien Regad <dregad@mantisbt.org> | 2019-05-08 15:01:03 +0200 |
| commit | 2a27bc0d1d7e48a4bdc8308487b9d6b8ed6c29e8 (patch) | |
| tree | f93334d3b87714f5f2af53d5546ac0bbfa4803d0 /adodb-active-recordx.inc.php | |
| parent | 5c619ce74b9ec57120ee868d313088f72ec653ac (diff) | |
| download | adodb-2a27bc0d1d7e48a4bdc8308487b9d6b8ed6c29e8.tar.gz adodb-2a27bc0d1d7e48a4bdc8308487b9d6b8ed6c29e8.tar.bz2 adodb-2a27bc0d1d7e48a4bdc8308487b9d6b8ed6c29e8.zip | |
active record: Use ADODB_ASSOC_CASE constant
Until now, active Record used an $ADODB_ASSOC_CASE *variable* to control
the fields' case, which is not used or referenced anywhere else in the
ADOdb library.
The correct, documented way of setting the fields' case in associative
fetch mode is to define the ADODB_ASSOC_CASE constant before including
adodb.inc.php.
This commit replaces usages of $ADODB_ASSOC_CASE variable by the
ADODB_ASSOC_CASE constant.
Fixes #536 (follow-up on #535)
Diffstat (limited to 'adodb-active-recordx.inc.php')
| -rw-r--r-- | adodb-active-recordx.inc.php | 10 |
1 files changed, 4 insertions, 6 deletions
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); |