Merge branch 'release/5.0.3' into v5

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Retour Changelog
 
+## 5.0.3 - 2024.08.19
+### Fixed
+* Fixed an issue where the "File Not Found URL" link could be wrong when clicked on in some multi-site setups ([#310](https://github.com/nystudio107/craft-retour/issues/310))
+
 ## 5.0.2 - 2024.06.24
 ### Added
 * Separate out the plugin settings into **General**, **Statistics**, and **Advanced** tabs

Makefile

@@ -0,0 +1,28 @@
+MAJOR_VERSION?=5
+PLUGINDEV_PROJECT_DIR?=/Users/andrew/webdev/sites/plugindev/cms_v${MAJOR_VERSION}/
+VENDOR?=nystudio107
+PROJECT_PATH?=${VENDOR}/$(shell basename $(CURDIR))
+
+.PHONY: dev release
+
+# Start up the buildchain dev server
+dev:
+	${MAKE} -C buildchain/ dev
+# Start up the docs dev server
+docs:
+	${MAKE} -C docs/ dev
+# Run code quality tools, tests, and build the buildchain & docs in preparation for a release
+release: --code-quality --code-tests --buildchain-clean-build --docs-clean-build
+# The internal targets used by the dev & release targets
+--buildchain-clean-build:
+	${MAKE} -C buildchain/ clean
+	${MAKE} -C buildchain/ image-build
+	${MAKE} -C buildchain/ build
+--code-quality:
+	${MAKE} -C ${PLUGINDEV_PROJECT_DIR} -- ecs check vendor/${PROJECT_PATH}/src --fix
+	${MAKE} -C ${PLUGINDEV_PROJECT_DIR} -- phpstan analyze -c vendor/${PROJECT_PATH}/phpstan.neon
+--code-tests:
+--docs-clean-build:
+	${MAKE} -C docs/ clean
+	${MAKE} -C docs/ image-build
+	${MAKE} -C docs/ fix

composer.json

@@ -2,7 +2,7 @@
   "name": "nystudio107/craft-retour",
   "description": "Retour allows you to intelligently redirect legacy URLs, so that you don't lose SEO value when rebuilding & restructuring a website",
   "type": "craft-plugin",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "keywords": [
     "craftcms",
     "craft-plugin",

docs/docs/advanced.md

@@ -93,7 +93,7 @@ Event::on(Redirects::class,
  );
 ```
 
-`beforeSaveEntryRedirect` is the event that is triggered before an Entry redirect is automatically saved when an Entry's URI is changed (assuming the **Create Entry Redirects** setting is enabled). You may set [[RedirectEvent::isValid]] to `false` to prevent the redirect from getting saved.
+`beforeSaveEntryRedirect` is the event that is triggered before an Entry redirect is automatically saved when an Entry’s URI is changed (assuming the **Create Entry Redirects** setting is enabled). You may set [[RedirectEvent::isValid]] to `false` to prevent the redirect from getting saved.
 
 ```php
 use nystudio107\retour\services\Events;

docs/docs/shortlinks.md

@@ -10,7 +10,7 @@ They are redirects under the hood, but are presented in a simplified interface t
 
 ## Short Link field
 
-To create short links, you'll need to create a Short Link field, and add it to the field layout of a Section.
+To create short links, you’ll need to create a Short Link field, and add it to the field layout of a Section.
 
 There are also field settings that let you choose how the short link should function (analogous to regular redirect settings):
 
@@ -27,7 +27,7 @@ When the entry is saved, a redirect will automtically be created that redirects
 In the above example, anyone visiting `https://example.com/promo` will be redirected to `https://example.com/my-first-blog`.
 
 * If a Short Link field is left blank, the corresponding redirect will be deleted.
-* A Short Link will be enabled and disabled with the element's status.
+* A Short Link will be enabled and disabled with the element’s status.
 * For multi-site setups, if you want different short links for each site, ensure you set the field propagation appropriately.
 * If a content author creates a Short Link to a URL that already exists, nothing will happen because Retour does nothing until Craft throws a 404
 

docs/docs/using.md

@@ -157,7 +157,7 @@ Arguments:
 
 ### Getting All Redirects
 
-If you want to retrieve **all** of the redirects that have been entered into Retour, you can to that with the `retourRedirects` query:
+To retrieve **all** of the redirects that have been entered into Retour, you can to that with the `retourRedirects` query:
 
 ```graphql
 {