#211015 follow-up by sun: Don't hard-code #theme for system_settings_form().

2 files changed, 19 insertions, 17 deletions

diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 7e672950f..9f13a60b4 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -2396,21 +2396,6 @@ function theme_system_modules_uninstall($variables) {
 }
 
 /**
- * Theme function for the system settings form.
- *
- * By default this does not alter the appearance of a form at all,
- * but is provided as a convenience for themers.
- *
- * @param $variables
- *   An associative array containing:
- *   - form: An associative array containing the structure of the form.
- * @ingroup themeable
- */
-function theme_system_settings_form($variables) {
-  return drupal_render_children($variables['form']);
-}
-
-/**
  * Theme function for the system themes form.
  *
  * @param $variables
diff --git a/modules/system/system.module b/modules/system/system.module
index 7398653ad..9ec9e942f 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -140,7 +140,6 @@ function system_theme() {
     ),
     'system_settings_form' => array(
       'render element' => 'form',
-      'file' => 'system.admin.inc',
     ),
     'confirm_form' => array(
       'render element' => 'form',
@@ -2455,7 +2454,10 @@ function system_settings_form($form, $automatic_defaults = TRUE) {
     drupal_set_message(t('The settings have not been saved because of the errors.'), 'error');
   }
   $form['#submit'][] = 'system_settings_form_submit';
-  $form['#theme'] = 'system_settings_form';
+  // By default, render the form using theme_system_settings_form().
+  if (!isset($form['#theme'])) {
+    $form['#theme'] = 'system_settings_form';
+  }
   return $form;
 }
 
@@ -3529,6 +3531,21 @@ function theme_confirm_form($variables) {
 }
 
 /**
+ * Theme function for the system settings form.
+ *
+ * By default this does not alter the appearance of a form at all,
+ * but is provided as a convenience for themers.
+ *
+ * @param $variables
+ *   An associative array containing:
+ *   - form: An associative array containing the structure of the form.
+ * @ingroup themeable
+ */
+function theme_system_settings_form($variables) {
+  return drupal_render_children($variables['form']);
+}
+
+/**
  * Template variable preprocessor for contextual links.
  */
 function system_preprocess(&$variables, $hook) {