mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
BUGFIX: Don't allow reinstalling without first making the user manually delete mysite/_config.php (from r108026)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112710 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
d30b478690
commit
a707f925ad
@ -35,7 +35,12 @@
|
||||
If you are having problems meeting the requirements, see the <a href="http://doc.silverstripe.org/doku.php?id=server-requirements">server requirements wiki page</a>.
|
||||
</p>
|
||||
<?php } else { ?>
|
||||
<?php if($req->hasWarnings()) { ?>
|
||||
<?php if($alreadyInstalled) { ?>
|
||||
<div class="warning">
|
||||
<p><strong>Note:</strong> SilverStripe is already installed here.<br>
|
||||
If you wish to reinstall SilverStripe, please delete the <strong>mysite/_config.php</strong> file first.</p>
|
||||
</div>
|
||||
<?php } else if($req->hasWarnings()) { ?>
|
||||
<p class="warning">
|
||||
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.<br>
|
||||
@ -254,17 +259,6 @@
|
||||
<small>(anonymous version information, used for statistical purposes)</small>
|
||||
</label><p>
|
||||
|
||||
<?php if($alreadyInstalled) { ?>
|
||||
<div class="warning">
|
||||
<p><strong>Note:</strong> SilverStripe is already installed here.<br>
|
||||
Installing again will overwrite the <strong><?php echo $webserverConfigFile ?></strong> and <strong>mysite/_config.php</strong> files.</p>
|
||||
<div class="warning_actions">
|
||||
<input type="checkbox" id="reinstall_confirmation" name="force_reinstall">
|
||||
<label for="reinstall_confirmation">That's okay, please re-install SilverStripe and overwrite these files.</label>
|
||||
</div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<p>
|
||||
<?php if($alreadyInstalled) { ?>
|
||||
<input id="install_button" type="submit" disabled="disabled" class="action" name="go" value="Install SilverStripe">
|
||||
|
Loading…
x
Reference in New Issue
Block a user