From 90feb751135c37c9c8db38dc2f41a497665f91c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Trouv=C3=A9?= <moodle@arnaudtrouve.fr>
Date: Fri, 19 Jan 2018 17:47:54 +0100
Subject: [PATCH] MDL-61248 admin: fix incorrectly initialized property

---
 lib/adminlib.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 30f756add0f..b14741ef7a4 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -2960,6 +2960,7 @@ class admin_setting_configselect extends admin_setting {
     public function __construct($name, $visiblename, $description, $defaultsetting, $choices) {
         // Look for optgroup and single options.
         if (is_array($choices)) {
+            $this->choices = [];
             foreach ($choices as $key => $val) {
                 if (is_array($val)) {
                     $this->optgroups[$key] = $val;