FIX getCachedMarkup returns NULL instead of string if file doesn't exist #562
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GuySartorelli
requested changes
Jul 11, 2023
Comment on lines
105
to
106
| $url = $url ?? ''; | ||
|
|
There was a problem hiding this comment.
I've tested without this and it doesn't seem to change anything... seems to not be needed?
There was a problem hiding this comment.
File::getURL() returns null
silverstripe-assets/src/File.php
Line 896 in 7605cda
And then we set this value in
$markup in cache. After we return $item['markup'] in getCachedMarkup method.So probably, there are some cases where we can get null from
getCachedMarkupI'll add checking in the
getCachedMarkup method.
| @@ -139,11 +141,12 @@ public static function handle_shortcode($arguments, $content, $parser, $shortcod | |||
| protected static function getCachedMarkup($cache, $cacheKey, $arguments): string | |||
| { | |||
| $item = $cache->get($cacheKey); | |||
| if ($item && !empty($item['filename'])) { | |||
| $assetStore = Injector::inst()->get(AssetStore::class); | |||
| if ($item && !empty($item['filename']) && $assetStore->exists($item['filename'], $item['hash'])) { | |||
There was a problem hiding this comment.
Suggested change
| if ($item && !empty($item['filename']) && $assetStore->exists($item['filename'], $item['hash'])) { | |
| if ($item && !empty($item['filename'])) { |
Move this below (see #562 (comment)) - we shouldn't hit the filesystem if we're not even allowing the grant.
| @@ -139,11 +141,12 @@ public static function handle_shortcode($arguments, $content, $parser, $shortcod | |||
| protected static function getCachedMarkup($cache, $cacheKey, $arguments): string | |||
| { | |||
| $item = $cache->get($cacheKey); | |||
| if ($item && !empty($item['filename'])) { | |||
| $assetStore = Injector::inst()->get(AssetStore::class); | |||
| if ($item && !empty($item['filename']) && $assetStore->exists($item['filename'], $item['hash'])) { | |||
| // Initiate a protected asset grant if necessary | |||
| $allowSessionGrant = static::getGrant(null, $arguments); | |||
| if ($allowSessionGrant) { | |||
There was a problem hiding this comment.
Suggested change
| if ($allowSessionGrant) { | |
| if ($allowSessionGrant && $assetStore->exists($item['filename'], $item['hash'])) { |
Moved as per #562 (comment)
sabina-talipova
force-pushed
the
pulls/1.13/fix-cachemarkup-issue
branch
from
7e2cebf
to
bd9ebb7
Compare
added 2 commits
July 11, 2023 14:28
GuySartorelli
approved these changes
Jul 11, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
getCachedMarkupmethod.handle_shortcodeshould return string.Test steps
FileShortcodeProvider::allow_session_grant = true;Insert Link to a filein Content field;Parent issue