summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/changelog.md3
-rw-r--r--pear/Auth/Container/ADOdb.php2
2 files changed, 3 insertions, 2 deletions
diff --git a/docs/changelog.md b/docs/changelog.md
index 6ebd912c..4adf83db 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -69,7 +69,8 @@ Older changelogs:
- pdo/mysql: remove extraneous comma in $fmtTimeStamp. #531
- active record: Use ADODB_ASSOC_CASE constant. #536
- session: Remove session_module_name('user') calls (PHP 7.2 compatibility). #449
-
+- PHP 7.4 compatibility: fix deprecated usage of join() #547
+
## 5.20.14 - 06-Jan-2019
- security: Denial of service in adodb_date(). #467
diff --git a/pear/Auth/Container/ADOdb.php b/pear/Auth/Container/ADOdb.php
index 7586213a..d2bb299d 100644
--- a/pear/Auth/Container/ADOdb.php
+++ b/pear/Auth/Container/ADOdb.php
@@ -199,7 +199,7 @@ class Auth_Container_ADOdb extends Auth_Container
/* Include additional fields if they exist */
if(!empty($this->options['db_fields'])){
if(is_array($this->options['db_fields'])){
- $this->options['db_fields'] = join($this->options['db_fields'], ', ');
+ $this->options['db_fields'] = join(', ', $this->options['db_fields'], );
}
$this->options['db_fields'] = ', '.$this->options['db_fields'];
}