From 53b98284fe5f9ee9b3b4e013eef66d21c170cce5 Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Thu, 16 Mar 2017 16:09:33 +1300 Subject: [PATCH 1/2] FIX Remove undefined var from installer --- src/Dev/Install/config-form.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Dev/Install/config-form.html b/src/Dev/Install/config-form.html index 4318ce148..1269ec9db 100644 --- a/src/Dev/Install/config-form.html +++ b/src/Dev/Install/config-form.html @@ -174,12 +174,10 @@ ?> -
>
- From 3e17dd3201c3234488c172f6bc14cf2aa7f44003 Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Thu, 16 Mar 2017 16:09:46 +1300 Subject: [PATCH 2/2] Move to template PHP syntax for installer --- src/Dev/Install/config-form.html | 57 ++++++++++++++++---------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/src/Dev/Install/config-form.html b/src/Dev/Install/config-form.html index 1269ec9db..65f2958ad 100644 --- a/src/Dev/Install/config-form.html +++ b/src/Dev/Install/config-form.html @@ -7,8 +7,8 @@ SilverStripe CMS / Framework Installation - - + + @@ -29,42 +29,42 @@
- +

You aren't currently able to install the software. Please see below for details.
If you are having problems meeting the requirements, see the server requirements.

- -

Your php.ini file is located at

- - - + +

Your php.ini file is located at

+ + +

Note: SilverStripe is already installed here.
If you wish to reinstall SilverStripe, please delete the mysite/_config.php file first.

- hasWarnings()) { ?> + hasWarnings()): ?>

There are some issues that we recommend you look at before installing, however, you are still able to install the software.
Please see below for details. If you are having problems meeting the requirements, see the server requirements.

- hasErrors() && !$adminReq->hasErrors()) { ?> + hasErrors() && !$adminReq->hasErrors()): ?>

You're ready to install! Please confirm the configuration options below. Install SilverStripe

- + - hasErrors()) { ?> + hasErrors()): ?>

The database details don't appear to be correct. Please review and correct before installing.

- + - hasErrors()) { ?> + hasErrors()): ?>

Please enter an email address and password for the default administrator account before installing.

- - + +

Requirements Step 1 of 5

showTable(); ?> @@ -200,14 +200,14 @@
- > + >
- > + >
@@ -246,17 +246,18 @@

Theme selection Step 4 of 5

You can change the theme or download another from the SilverStripe website after installation.

    -
  • checked="checked">
    • -
  • checked="checked">
    • +
  • checked="checked">
    • +
  • checked="checked">

Confirm Install Step 5 of 5

- +

You aren't currently able to install the software. Please see above for details.
If you are having problems meeting the requirements, see the server requirements page.

- +

- + - + - +

- +
@@ -285,7 +286,7 @@