what am i doing that won't work
This commit is contained in:
parent
545f183c70
commit
a37a14a398
@ -14,6 +14,9 @@
|
|||||||
'body' => ''
|
'body' => ''
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// this breaks the dispaly of licenses if enabled
|
||||||
|
$config['minify_html'] = false;
|
||||||
|
|
||||||
if(file_exists($config['has_installed'])) {
|
if(file_exists($config['has_installed'])) {
|
||||||
|
|
||||||
// Check the version number
|
// Check the version number
|
||||||
@ -137,7 +140,7 @@
|
|||||||
if(!isset($_GET['confirm'])) {
|
if(!isset($_GET['confirm'])) {
|
||||||
$page['title'] = 'License Change';
|
$page['title'] = 'License Change';
|
||||||
$page['body'] = '<p style="text-align:center">You are upgrading to a version which uses an amended license. The licenses included with Tinyboard distributions prior to this version (v0.9.4-dev-2) are still valid for those versions, but no longer apply to this and newer versions.</p>' .
|
$page['body'] = '<p style="text-align:center">You are upgrading to a version which uses an amended license. The licenses included with Tinyboard distributions prior to this version (v0.9.4-dev-2) are still valid for those versions, but no longer apply to this and newer versions.</p>' .
|
||||||
'<textarea style="width:700px;height:370px;margin:auto;display:block;background:white;color:black" disabled>' . str_replace("\n", '<br/>', htmlentities(file_get_contents('LICENSE.md'))) . '</textarea>
|
'<textarea style="width:700px;height:370px;margin:auto;display:block;background:white;color:black" disabled>' . htmlentities(file_get_contents('LICENSE.md')) . '</textarea>
|
||||||
<p style="text-align:center">
|
<p style="text-align:center">
|
||||||
<a href="?confirm=1">I have read and understood the agreement. Proceed to upgrading.</a>
|
<a href="?confirm=1">I have read and understood the agreement. Proceed to upgrading.</a>
|
||||||
</p>';
|
</p>';
|
||||||
@ -167,7 +170,7 @@
|
|||||||
if($step == 0) {
|
if($step == 0) {
|
||||||
// Agreeement
|
// Agreeement
|
||||||
$page['body'] = '
|
$page['body'] = '
|
||||||
<textarea style="width:700px;height:370px;margin:auto;display:block;background:white;color:black" disabled>' . str_replace("\n", '<br/>', htmlentities(file_get_contents('LICENSE.md'))) . '</textarea>
|
<textarea style="width:700px;height:370px;margin:auto;display:block;background:white;color:black" disabled>' . htmlentities(file_get_contents('LICENSE.md')) . '</textarea>
|
||||||
<p style="text-align:center">
|
<p style="text-align:center">
|
||||||
<a href="?step=1">I have read and understood the agreement. Proceed to installation.</a>
|
<a href="?step=1">I have read and understood the agreement. Proceed to installation.</a>
|
||||||
</p>';
|
</p>';
|
||||||
|
Loading…
Reference in New Issue
Block a user