From 19da4511fb54d7850f64d0cbbaaac9a2abe23388 Mon Sep 17 00:00:00 2001
From: Bizley <pawel@positive.codes>
Date: Mon, 11 Jan 2021 09:16:52 +0100
Subject: [PATCH] Fix #18472: Fix initializing `db` component configuration in
 `yii\data\ActiveDataProvider`

---
 framework/CHANGELOG.md                | 1 +
 framework/data/ActiveDataProvider.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index c7a677e68d..02c86ff14e 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -6,6 +6,7 @@ Yii Framework 2 Change Log
 
 - Enh #18447: Do not use `getLastInsertID` to get PK from insert query to lower collision probability for concurrent inserts (darkdef)
 - Bug #18448: Fix issues in queries and tests for older MSSQL versions (darkdef)
+- Bug #18472: Fix initializing `db` component configuration in `yii\data\ActiveDataProvider` (bizley)
 
 
 2.0.40 December 23, 2020
diff --git a/framework/data/ActiveDataProvider.php b/framework/data/ActiveDataProvider.php
index 5a4fbb88ae..44d547c0ab 100644
--- a/framework/data/ActiveDataProvider.php
+++ b/framework/data/ActiveDataProvider.php
@@ -88,7 +88,7 @@ class ActiveDataProvider extends BaseDataProvider
     public function init()
     {
         parent::init();
-        if (is_string($this->db)) {
+        if ($this->db !== null) {
             $this->db = Instance::ensure($this->db, Connection::className());
         }
     }