Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MINOR Updating old URLs in installer, show message about creating admin

account
  • Loading branch information...
commit 515a2ccfccfbc589399e89564e4b529bb666a367 1 parent e71b8d6
@halkyon halkyon authored
Showing with 5 additions and 11 deletions.
  1. +2 −8 dev/install/config-form.html
  2. +3 −3 dev/install/install.php5
View
10 dev/install/config-form.html
@@ -28,12 +28,6 @@
<div id="Layout">
<div class="typography">
- <!--
-<p>Thanks for choosing to use SilverStripe! Please follow the instructions below and you should be up in running in no time.<br>
- If you get stuck, head over to the <a href="http://silverstripe.org/installing-silverstripe" target="_blank">installation forum</a>, or check out our list of <a href="http://doc.silverstripe.org/doku.php?id=suggested-web-hosts" target="_blank">suggested web hosts</a> known to work with SilverStripe.
- </p>
--->
-
<form action="install.php" method="post">
<?php if(isset($hasErrorOtherThanDatabase)) { ?>
<p class="message error">
@@ -96,7 +90,7 @@ <h3 class="sectionHeading">Database Configuration <small>Step 2 of 5</small></h3
<strong>Other databases:</strong><br>
Databases in the list that are greyed out cannot currently be used. Click on them for more information and possible remedies.
</p>
- <div class="fields">
+ <div class="fields">
<div class="field">
<ul id="database_selection">
<?php
@@ -184,7 +178,7 @@ <h3 class="sectionHeading">Database Configuration <small>Step 2 of 5</small></h3
<?php if($envFileExists) { ?>
<div id="use_environment_field" class="field">
<input id="use_environment" type="checkbox" name="useEnv" <?php if($usingEnv) echo "checked=\"checked\"" ?>>
- <label for="use_environment">Use _ss_environment file for configuration (<a href="http://doc.silverstripe.org/doku.php?id=environment-management" target="_blank">?</a>)</label>
+ <label for="use_environment">Use _ss_environment file for configuration (<a href="http://doc.silverstripe.org/sapphire/en/topics/environment-management" target="_blank">?</a>)</label>
</div>
<?php } ?>
View
6 dev/install/install.php5
@@ -392,9 +392,7 @@ class InstallRequirements {
// Check for Standard PHP Library (SPL) support
$this->requireFunction('spl_classes', array('PHP Configuration', 'SPL support', 'Standard PHP Library (SPL) not included in PHP.'));
- if(version_compare(PHP_VERSION, '5.3.0', '>=')) {
- $this->requireDateTimezone(array('PHP Configuration', 'date.timezone set and valid', 'date.timezone option in php.ini must be set in PHP 5.3.0+', ini_get('date.timezone')));
- }
+ $this->requireDateTimezone(array('PHP Configuration', 'date.timezone set and valid', 'date.timezone option in php.ini must be set correctly.', ini_get('date.timezone')));
$this->suggestPHPSetting('asp_tags', array(false,0,''), array('PHP Configuration', 'asp_tags option turned off', 'This should be turned off as it can cause issues with SilverStripe'));
$this->suggestPHPSetting('magic_quotes_gpc', array(false,0,''), array('PHP Configuration', 'magic_quotes_gpc option turned off', 'This should be turned off, as it can cause issues with cookies. More specifically, unserializing data stored in cookies.'));
@@ -1135,8 +1133,10 @@ PHP
// @todo Exception thrown if database with admin already exists with same Email
try {
+ $this->statusMessage('Creating default admin account...');
$adminMember->write();
} catch(Exception $e) {
+ $this->statusMessage('Admin account could not be created.');
}
// Syncing filesystem (so /assets/Uploads is available instantly, see ticket #2266)
Please sign in to comment.
Something went wrong with that request. Please try again.