From 62cdc43e781069248f7a4f2f066838d71b0a72e1 Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Tue, 11 Jun 2019 15:17:25 +1200 Subject: [PATCH 1/4] DOC Add missing reference to TagToShortcodeTask. --- docs/en/03_Upgrading/01_Upgrading_project.md | 2 +- docs/en/04_Changelogs/4.4.0.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/03_Upgrading/01_Upgrading_project.md b/docs/en/03_Upgrading/01_Upgrading_project.md index bfd8c179c..c124cb9f9 100644 --- a/docs/en/03_Upgrading/01_Upgrading_project.md +++ b/docs/en/03_Upgrading/01_Upgrading_project.md @@ -1235,7 +1235,7 @@ has been added to assist in migration of existing files (see [file migration doc ./vendor/bin/sake dev/tasks/MigrateFileTask ``` -##### Rewriting asset references +##### Rewriting asset references{#tagtoshortcode} Your `img` and `a` tag references to your assets may now be pointing to a location in your assets folder that has been moved. There is a task available which will look through all your tables containing `HTMLText` and `HTMLVarchar` fields looking for broken references and then rewrite them to the new location of the file. diff --git a/docs/en/04_Changelogs/4.4.0.md b/docs/en/04_Changelogs/4.4.0.md index a96193e24..46e81858f 100644 --- a/docs/en/04_Changelogs/4.4.0.md +++ b/docs/en/04_Changelogs/4.4.0.md @@ -70,7 +70,7 @@ We have ironed out some edge cases since then: * [Hash-less public asset URLs](#hash-less) * [Legacy thumbnail locations](#legacy-thumb) - * TODO Shortcode migration + * [HTMLText short code migration](/Upgrading/Upgrading_projec#tagtoshortcode) You can opt-in to performing these migration tasks on your already upgraded SilverStripe 4.x project. From 0294029f92362b60916e929cdd862a136d285beb Mon Sep 17 00:00:00 2001 From: Guy Marriott Date: Thu, 13 Jun 2019 10:46:48 +1200 Subject: [PATCH 2/4] DOCS Remove confusing API change from changelog This change was removing a method that was added in 4.4.0 also - this makes it not a breaking change for SemVer --- docs/en/04_Changelogs/4.4.0.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/en/04_Changelogs/4.4.0.md b/docs/en/04_Changelogs/4.4.0.md index 46e81858f..f432fcd03 100644 --- a/docs/en/04_Changelogs/4.4.0.md +++ b/docs/en/04_Changelogs/4.4.0.md @@ -359,7 +359,6 @@ SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest: ### API Changes - * 2019-05-06 [8ee50d2ba](https://github.com/silverstripe/silverstripe-framework/commit/8ee50d2ba7ff582bf317de7c1149d17bab1eb4fa) Remove DataObjectSchema::getFieldMap() (#8960) (Maxime Rainville) * 2019-05-03 [5337e6d04](https://github.com/silverstripe/silverstripe-framework/commit/5337e6d04847c66d0a293e9c6c53a58d97aea3a1) Replace FormActions with anchors to enable panel-based loading in GridField navigation buttons (#8953) (Robbie Averill) * 2019-04-30 [d325b8a](https://github.com/silverstripe/silverstripe-assets/commit/d325b8a6e0594ba50de1033edc5b99428ed6e5dd) Mark the FlysystemAssetStore FileResolutionStrategy getters and setters as internal (#255) (Maxime Rainville) * 2019-04-16 [3c6357d](https://github.com/silverstripe/silverstripe-assets/commit/3c6357d5856857fe21d893495071d989a8500bed) Add an extension to the regular AssetStore interface (Maxime Rainville) From 7e12bee86a7dffc5efec83067a63d8da5b18d2c8 Mon Sep 17 00:00:00 2001 From: 3Dgoo Date: Sat, 15 Jun 2019 10:37:49 +0930 Subject: [PATCH 3/4] Requirements_Backend.php API documentation fix The API documentation for Requirements_Backend is currently broken: https://api.silverstripe.org/4/SilverStripe/View/Requirements_Backend.html#method_customScript This is because there are unescaped start tags in the function documentation. This is the same as the recent #9060 PR, but for the Requirements_Backend class this time. This fix changes the tags to be escaped. --- src/View/Requirements_Backend.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/View/Requirements_Backend.php b/src/View/Requirements_Backend.php index 70bdba384..795379ff1 100644 --- a/src/View/Requirements_Backend.php +++ b/src/View/Requirements_Backend.php @@ -82,14 +82,14 @@ class Requirements_Backend protected $customScript = array(); /** - * All custom CSS rules which are inserted directly at the bottom of the HTML tag + * All custom CSS rules which are inserted directly at the bottom of the HTML `` tag * * @var array */ protected $customCSS = array(); /** - * All custom HTML markup which is added before the closing tag, e.g. additional + * All custom HTML markup which is added before the closing `` tag, e.g. additional * metatags. * * @var array @@ -148,8 +148,8 @@ class Requirements_Backend protected $combinedFilesFolder = null; /** - * Put all JavaScript includes at the bottom of the template before the closing tag, - * rather than the default behaviour of placing them at the end of the tag. This means + * Put all JavaScript includes at the bottom of the template before the closing `` tag, + * rather than the default behaviour of placing them at the end of the `` tag. This means * script downloads won't block other HTTP requests, which can be a performance improvement. * * @var bool @@ -522,7 +522,7 @@ class Requirements_Backend /** * Register the given JavaScript code into the list of requirements * - * @param string $script The script content as a string (without enclosing