Merge branch 'develop'

data/config/template.php

@@ -1,3 +1,4 @@
 <?php	return array (
   'cmf_default_theme' => 'simpleboot3',
+  'cmf_admin_default_theme' => 'admin_simpleboot3',
 );

public/themes/admin_simpleboot3/admin/setting/site.html

@@ -194,7 +194,7 @@
                     </div>
                     <div class="tab-pane" id="F">
                         <div class="form-group">
-                            <label for="input-banned_usernames" class="col-sm-2 control-label">用户注册验证</label>
+                            <label class="col-sm-2 control-label">用户注册验证</label>
                             <div class="col-md-6 col-sm-10">
                                 <select class="form-control" name="cmf_settings[open_registration]">
                                     <option value="0">是</option>
@@ -205,13 +205,6 @@
                                 </select>
                             </div>
                         </div>
-                        <div class="form-group" style="display: none;">
-                            <label for="input-banned_usernames" class="col-sm-2 control-label">{:lang('SPECAIL_USERNAME')}</label>
-                            <div class="col-md-6 col-sm-10">
-                                <textarea class="form-control" id="input-banned_usernames"
-                                          name="cmf_settings[banned_usernames]">{$cmf_settings.banned_usernames}</textarea>
-                            </div>
-                        </div>
                         <div class="form-group">
                             <div class="col-sm-offset-2 col-sm-10">
                                 <button type="submit" class="btn btn-primary js-ajax-submit" data-refresh="0">

vendor/thinkcmf/cmf/src/common.php

@@ -549,7 +549,7 @@ function cmf_get_option($key)
 
     $cmfGetOption[$key] = $optionValue;
 
-    return $optionValue;
+    return $optionValue ?? [];
 }
 
 /**