Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: remediate erroneous white space in game and ach shortcode rendering #1544

Merged
merged 8 commits into from
May 5, 2023
Merged

fix: remediate erroneous white space in game and ach shortcode rendering #1544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ae65380
fix(renderGameTitle): remediate erroneous white space
wescopeland May 2, 2023
56bf12b
fix: remediate hack white space issue
wescopeland May 2, 2023
c27d351
Merge branch 'master' into fix-game-avatar-double-space
wescopeland May 2, 2023
9930111
fix(achievement): trim extra white space
wescopeland May 2, 2023
bd0089f
fix: strip more consecutive spaces in achievements rendering
wescopeland May 2, 2023
d57828e
chore: lint
wescopeland May 2, 2023
f818870
fix: address pr feedback
wescopeland May 5, 2023
05960d5
Merge branch 'master' into fix-game-avatar-double-space
Jamiras May 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app_legacy/Helpers/render/achievement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,11 @@ function renderAchievementTitle(?string $title, bool $tags = true): string
}
$title = str_replace('[m]', '', $title);

return "$title$missableTag";
// If we don't strip consecutive spaces, the
// browser doesn't collapse them in forum <pre> tags.
$title = preg_replace('/\s+/', ' ', $title);
Jamiras marked this conversation as resolved.
Show resolved Hide resolved

return trim("$title$missableTag");
}

function renderAchievementCard(int|string|array $achievement, ?string $context = null, ?string $iconUrl = null): string
Expand Down
2 changes: 1 addition & 1 deletion app_legacy/Helpers/render/game.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ function renderGameTitle(?string $title = null, bool $tags = true): string
$updateHtml($html, $match, $tags ? " $span" : '');
}
$matches = [];
if (preg_match('/\[Subset - (.+)\]/', $title, $matches)) {
if (preg_match('/\s?\[Subset - (.+)\]/', $title, $matches)) {
$subset = $matches[1];
$span = "<span class='tag'>"
. "<span class='tag-label'>Subset</span>"
Expand Down