opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to drupal 8.0.0-rc1. For more information, see https://www.drupal.org/node/2582663

Browse source
This commit is contained in:
Greg Anderson 2015-10-08 11:40:12 -07:00
parent eb34d130a8
commit f32e58e4b1
8476 changed files with 211648 additions and 170042 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php
View file

@ -26,11 +26,11 @@ class AlreadyInstalledException extends InstallerException {
$title = $this->t('Drupal already installed');
$message = $this->t('<ul>
<li>To start over, you must empty your existing database and copy <em>default.settings.php</em> over <em>settings.php</em>.</li>
<li>To upgrade an existing installation, proceed to the <a href="!update-url">update script</a>.</li>
<li>View your <a href="!base-url">existing site</a>.</li>
<li>To upgrade an existing installation, proceed to the <a href=":update-url">update script</a>.</li>
<li>View your <a href=":base-url">existing site</a>.</li>
</ul>', array(
'!base-url' => $GLOBALS['base_url'],
'!update-url' => $GLOBALS['base_path'] . 'update.php',
':base-url' => $GLOBALS['base_url'],
':update-url' => $GLOBALS['base_path'] . 'update.php',
));
parent::__construct($message, $title);
}

18
core/lib/Drupal/Core/Installer/Form/SelectLanguageForm.php
View file

@ -7,7 +7,6 @@
namespace Drupal\Core\Installer\Form;
use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\UserAgent;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
@ -16,6 +15,9 @@ use Symfony\Component\HttpFoundation\Request;
/**
* Provides the language selection form.
*
* Note that hardcoded text provided by this form is not translated. This is
* because translations are downloaded as a result of submitting this form.
*/
class SelectLanguageForm extends FormBase {
@ -40,7 +42,7 @@ class SelectLanguageForm extends FormBase {
$select_options = array();
$browser_options = array();
$form['#title'] = $this->t('Choose language');
$form['#title'] = 'Choose language';
// Build a select list with language names in native language for the user
// to choose from. And build a list of available languages for the browser
@ -62,18 +64,18 @@ class SelectLanguageForm extends FormBase {
$browser_langcode = UserAgent::getBestMatchingLangcode($request->server->get('HTTP_ACCEPT_LANGUAGE'), $browser_options);
$form['langcode'] = array(
'#type' => 'select',
'#title' => $this->t('Choose language'),
'#title' => 'Choose language',
'#title_display' => 'invisible',
'#options' => $select_options,
// Use the browser detected language as default or English if nothing found.
'#default_value' => !empty($browser_langcode) ? $browser_langcode : 'en',
);
$link_to_english = install_full_redirect_url(array('parameters' => array('langcode' => 'en')));
$form['help'] = array(
'#type' => 'item',
'#markup' => SafeMarkup::format('<p>Translations will be downloaded from the <a href="http://localize.drupal.org">Drupal Translation website</a>.
If you do not want this, select <a href="!english">English</a>.</p>', array(
'!english' => install_full_redirect_url(array('parameters' => array('langcode' => 'en'))),
)),
// #markup is XSS admin filtered which ensures unsafe protocols will be
// removed from the url.
'#markup' => '<p>Translations will be downloaded from the <a href="http://localize.drupal.org">Drupal Translation website</a>. If you do not want this, select <a href="' . $link_to_english . '">English</a>.</p>',
'#states' => array(
'invisible' => array(
'select[name="langcode"]' => array('value' => 'en'),
@ -83,7 +85,7 @@ class SelectLanguageForm extends FormBase {
$form['actions'] = array('#type' => 'actions');
$form['actions']['submit'] = array(
'#type' => 'submit',
'#value' => $this->t('Save and continue'),
'#value' => 'Save and continue',
'#button_type' => 'primary',
);
return $form;

6
core/lib/Drupal/Core/Installer/Form/SiteConfigureForm.php
View file

@ -137,7 +137,7 @@ class SiteConfigureForm extends ConfigFormBase {
// successfully.)
$post_params = $this->getRequest()->request->all();
if (empty($post_params) && (!drupal_verify_install_file($this->root . '/' . $settings_file, FILE_EXIST|FILE_READABLE|FILE_NOT_WRITABLE) || !drupal_verify_install_file($this->root . '/' . $settings_dir, FILE_NOT_WRITABLE, 'dir'))) {
drupal_set_message(t('All necessary changes to %dir and %file have been made, so you should remove write permissions to them now in order to avoid security risks. If you are unsure how to do so, consult the <a href="@handbook_url">online handbook</a>.', array('%dir' => $settings_dir, '%file' => $settings_file, '@handbook_url' => 'https://www.drupal.org/server-permissions')), 'warning');
drupal_set_message(t('All necessary changes to %dir and %file have been made, so you should remove write permissions to them now in order to avoid security risks. If you are unsure how to do so, consult the <a href=":handbook_url">online handbook</a>.', array('%dir' => $settings_dir, '%file' => $settings_file, ':handbook_url' => 'https://www.drupal.org/server-permissions')), 'warning');
}
$form['#attached']['library'][] = 'system/drupal.system';
@ -174,7 +174,7 @@ class SiteConfigureForm extends ConfigFormBase {
'#type' => 'textfield',
'#title' => $this->t('Username'),
'#maxlength' => USERNAME_MAX_LENGTH,
'#description' => $this->t('Spaces are allowed; punctuation is not allowed except for periods, hyphens, and underscores.'),
'#description' => $this->t("Several special characters are allowed, including space, period (.), hyphen (-), apostrophe ('), underscore (_), and the @ sign."),
'#required' => TRUE,
'#attributes' => array('class' => array('username')),
);
@ -227,7 +227,7 @@ class SiteConfigureForm extends ConfigFormBase {
2 => $this->t('Receive email notifications'),
),
'#default_value' => array(1, 2),
'#description' => $this->t('The system will notify you when updates and important security releases are available for installed components. Anonymous information about your site is sent to <a href="@drupal">Drupal.org</a>.', array('@drupal' => 'https://www.drupal.org')),
'#description' => $this->t('The system will notify you when updates and important security releases are available for installed components. Anonymous information about your site is sent to <a href=":drupal">Drupal.org</a>.', array(':drupal' => 'https://www.drupal.org')),
'#weight' => 15,
);
$form['update_notifications']['update_status_module'][2] = array(