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

UTCT-86: Make QR code plugin compatible with 404 plugin #90

Merged
merged 3 commits into from
Apr 25, 2024
+2 −2
Merged

UTCT-86: Make QR code plugin compatible with 404 plugin #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71c71b7
UTCT-86: Change hook to make compatible with 404 plugin.
UTCGilligan Apr 25, 2024
8be3b3f
UTCT-86: Make the 404 wordmark path work with all bad paths.
UTCGilligan Apr 25, 2024
9540abf
Merge pull request #89 from UTCGilligan/feature/UTCT-86-404-different…
UTCGilligan Apr 25, 2024
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
2 changes: 1 addition & 1 deletion 404.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div class="col-12 col-lg-10 col-xl-8 col-xxl-5 mt-5">
<div class="card border-0 mt-5">
<div class="text-center">
<img src="frontend/assets/svg/utc-wordmark-reverse.svg" alt="UTC Logo" width="300px" style="margin-top:-4rem;">
<img src="<?php $_SERVER['DOCUMENT_ROOT'] ?>/frontend/assets/svg/utc-wordmark-reverse.svg" alt="UTC Logo" width="300px" style="margin-top:-4rem;">
</div>
<div class="card-body px-md-5">
<h1>Sorry,</h1>
Expand Down
2 changes: 1 addition & 1 deletion user/plugins/seans-qrcode/plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class LogoOptions extends QROptions{
}

// Kick in if the loader does not recognize a valid pattern
yourls_add_action( 'loader_failed', 'sean_yourls_qrcode' );
yourls_add_action( 'redirect_keyword_not_found', 'sean_yourls_qrcode' );
function sean_yourls_qrcode( $request ) {
// Get authorized charset in keywords and make a regexp pattern
$pattern = yourls_make_regexp_pattern( yourls_get_shorturl_charset() );
Expand Down
Loading