admin setting: MDL-18485 Improve the display of defaults for admin_setting_text_with_...

diff --git a/lib/adminlib.php b/lib/adminlib.php
index e1f1c772bcb55750c361952a38d54d362b9acb3a..89852600e2dd26aeac42259ba2ac1bd38d2ee578 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -3008,8 +3008,12 @@ class admin_setting_text_with_advanced extends admin_setting_configtext {
     public function output_html($data, $query='') {
         $default = $this->get_defaultsetting();
         $defaultinfo = array();
-        if (isset($this->choices[$default['value']])) {
-            $defaultinfo[] = $default['value'];
+        if (isset($default['value'])) {
+            if ($default['value'] === '') {
+                $defaultinfo[] = "''";
+            } else {
+                $defaultinfo[] = $default['value'];
+            }
         }
         if (!empty($default['fix'])) {
             $defaultinfo[] = get_string('advanced');