summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSavetheinternet <savetheinternet@tinyboard.org>2011-11-18 02:37:58 +1100
committerSavetheinternet <savetheinternet@tinyboard.org>2011-11-18 02:37:58 +1100
commita37a14a398261e80409ca4218e273fbff5170598 (patch)
treef02a89f2845c6c0590771502bab32ff3a62842a6
parent545f183c70d0c95364e0edce9260c891c6759f17 (diff)
what am i doing that won't work
-rw-r--r--install.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/install.php b/install.php
index 7bd715ac..6ace207d 100644
--- a/install.php
+++ b/install.php
@@ -14,6 +14,9 @@
'body' => ''
);
+ // this breaks the dispaly of licenses if enabled
+ $config['minify_html'] = false;
+
if(file_exists($config['has_installed'])) {
// Check the version number
@@ -137,7 +140,7 @@
if(!isset($_GET['confirm'])) {
$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>' .
- '<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">
<a href="?confirm=1">I have read and understood the agreement. Proceed to upgrading.</a>
</p>';
@@ -167,7 +170,7 @@
if($step == 0) {
// Agreeement
$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">
<a href="?step=1">I have read and understood the agreement. Proceed to installation.</a>
</p>';