fixed problem with applying of default settings during install - choices can not...

diff --git a/admin/adminlib.php b/admin/adminlib.php
index fb20d8cbd5e64c8c3482aa91bfc7af6e9577adda..7db9e22fefc19cc7c6d80af9475da1b4be980c32 100644 (file)
--- a/admin/adminlib.php
+++ b/admin/adminlib.php
@@ -634,7 +634,8 @@ class admin_setting_configselect extends admin_setting {
     
     function write_setting($data) {
          // check that what we got was in the original choices
-         if (! in_array($data, array_keys($this->choices))) {
+         // or that the data is the default setting - needed during install when choices can not be constructed yet
+         if ($data != $this->defaultsetting and ! in_array($data, array_keys($this->choices))) {
              return 'Error setting ' . $this->visiblename . '<br />';
          }