From 2b79a0c5bac111f990ebfa5976aee5e7ed31aba6 Mon Sep 17 00:00:00 2001 From: Razon Yang Date: Mon, 31 Dec 2018 19:43:07 +0800 Subject: [PATCH] Fixes #16945: Fixed RBAC DbManager ruleName fetching on the case of PDO::ATTR_ORACLE_NULLS => PDO::NULL_TO_STRING --- framework/CHANGELOG.md | 1 + framework/rbac/DbManager.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index be7851cdf8..7bddf76640 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -4,6 +4,7 @@ Yii Framework 2 Change Log 2.0.16 under development ------------------------ +- Bug #16945: Fixed RBAC DbManager ruleName fetching on the case of PDO::ATTR_ORACLE_NULLS => PDO::NULL_TO_STRING (razonyang) - Bug #16081: Fixed composite IN using just one column (rugabarbo) - Bug #16926: Fix shell autocompletion (GHopperMSK) - Bug #15850: check basePath is writable on publish in AssetManager (Groonya) diff --git a/framework/rbac/DbManager.php b/framework/rbac/DbManager.php index 3c1e84f3d5..04386cb35f 100644 --- a/framework/rbac/DbManager.php +++ b/framework/rbac/DbManager.php @@ -451,7 +451,7 @@ class DbManager extends BaseManager 'name' => $row['name'], 'type' => $row['type'], 'description' => $row['description'], - 'ruleName' => $row['rule_name'], + 'ruleName' => $row['rule_name'] ?: null, 'data' => $data, 'createdAt' => $row['created_at'], 'updatedAt' => $row['updated_at'],