Merge remote-tracking branch 'origin/master' into fetchimagetokexternal

1 files changed, 23 insertions, 0 deletions

diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index 8eb99284d..63be3a726 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -717,6 +717,29 @@ if (!class_exists('setting_email')) {
         $this->_local = $input;
         return true;
     }
+    function html(&$plugin, $echo=false) {
+        $value = '';
+        $disable = '';
+
+        if ($this->is_protected()) {
+          $value = $this->_protected;
+          $disable = 'disabled="disabled"';
+        } else {
+          if ($echo && $this->_error) {
+            $value = $this->_input;
+          } else {
+            $value = is_null($this->_local) ? $this->_default : $this->_local;
+          }
+        }
+
+        $multiple = $this->_multiple ? 'multiple="multiple"' : '';
+        $key = htmlspecialchars($this->_key);
+        $value = htmlspecialchars($value);
+
+        $label = '<label for="config___'.$key.'">'.$this->prompt($plugin).'</label>';
+        $input = '<input id="config___'.$key.'" name="config['.$key.']" type="email" class="edit" value="'.$value.'" '.$multiple.' '.$disable.'/>';
+        return array($label,$input);
+    }
   }
 }