summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2015-05-14 18:12:44 (GMT)
committerAlex Pott2015-05-14 18:12:44 (GMT)
commit2c0cfe97efc03aedd7a342791dcffc82825cd49b (patch)
treee9208082ba239cb0cad437c06de2687dc00c77af
parentb4412457db909ffcd61c32494c4363ad971763e2 (diff)
Issue #2473709 by nicoloye, marcvangend, pjbaert, yoroy, webchick: Do not use SERVER_NAME as default value for the site name
-rw-r--r--core/profiles/minimal/minimal.profile17
-rw-r--r--core/profiles/standard/standard.profile4
2 files changed, 2 insertions, 19 deletions
diff --git a/core/profiles/minimal/minimal.profile b/core/profiles/minimal/minimal.profile
deleted file mode 100644
index 4f6570a..0000000
--- a/core/profiles/minimal/minimal.profile
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * @file
- * Enables modules and site configuration for a minimal site installation.
- */
-
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Implements hook_form_FORM_ID_alter() for install_configure_form().
- *
- * Allows the profile to alter the site configuration form.
- */
-function minimal_form_install_configure_form_alter(&$form, FormStateInterface $form_state) {
- // Pre-populate the site name with the server name.
- $form['site_information']['site_name']['#default_value'] = \Drupal::request()->server->get('SERVER_NAME');
-}
diff --git a/core/profiles/standard/standard.profile b/core/profiles/standard/standard.profile
index 030b92a..887a984 100644
--- a/core/profiles/standard/standard.profile
+++ b/core/profiles/standard/standard.profile
@@ -13,8 +13,8 @@ use Drupal\Core\Form\FormStateInterface;
* Allows the profile to alter the site configuration form.
*/
function standard_form_install_configure_form_alter(&$form, FormStateInterface $form_state) {
- // Pre-populate the site name with the server name.
- $form['site_information']['site_name']['#default_value'] = \Drupal::request()->server->get('SERVER_NAME');
+ // Add a placeholder as example that one can choose an arbitrary site name.
+ $form['site_information']['site_name']['#attributes']['placeholder'] = t('My site');
$form['#submit'][] = 'standard_form_install_configure_submit';
}