Skip to content

Commit

Permalink
[BUGFIX] Remove double encoding of upgrade wizard.
Browse files Browse the repository at this point in the history
Replace the <br>-Tags with a LF char and render the linebreak
using CSS.

Resolves: #83875
Releases: master
Change-Id: I4429d2929104f922d5f9c0e5c048617848e805e5
Reviewed-on: https://review.typo3.org/55987
Reviewed-by: Frank Naegler <frank.naegler@typo3.org>
Tested-by: Frank Naegler <frank.naegler@typo3.org>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Guido Schmechel <littlegee@web.de>
Tested-by: Guido Schmechel <littlegee@web.de>
Reviewed-by: Michael Oehlhof <typo3@oehlhof.de>
Reviewed-by: Joerg Boesche <typo3@joergboesche.de>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
  • Loading branch information
georgringer committed Mar 5, 2018
1 parent 590c3a4 commit db6bfaf
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
6 changes: 6 additions & 0 deletions Build/Resources/Public/Sass/install.scss
Expand Up @@ -403,3 +403,9 @@ a[data-toggle="collapse"] {
table-layout: fixed;
word-wrap: break-word;
}

.upgradeWizards-wizards-output {
.row-explanation {
white-space: pre-wrap;
}
}
Expand Up @@ -83,7 +83,7 @@ public function checkForUpdate(&$description)
1484066647
);
}
$description .= '<br />' . htmlspecialchars($rowUpdater->getTitle());
$description .= LF . $rowUpdater->getTitle();
}

return $updateNeeded;
Expand Down
Expand Up @@ -51,7 +51,7 @@
</div>
<div class="t3js-upgradeWizards-list-row-template">
<h4 class="t3js-upgradeWizards-list-row-title"></h4>
<div class="t3js-upgradeWizards-list-row-explanation"></div>
<div class="row-explanation t3js-upgradeWizards-list-row-explanation"></div>
<button class="btn btn-default t3js-upgradeWizards-list-row-execute" type="button">
Execute
</button>
Expand Down Expand Up @@ -104,7 +104,7 @@ <h4 class="t3js-upgradeWizards-input-title">{updateData.title}</h4>
<hr>

<h4>Available wizards</h4>
<div class="t3js-upgradeWizards-wizards-output"></div>
<div class="upgradeWizards-wizards-output t3js-upgradeWizards-wizards-output"></div>

<hr>

Expand Down
2 changes: 1 addition & 1 deletion typo3/sysext/install/Resources/Public/Css/install.css

Large diffs are not rendered by default.

0 comments on commit db6bfaf

Please sign in to comment.