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

Shortcode: Properly handle case where no attributes are passed #13432

Merged
merged 7 commits into from Jul 26, 2023
Merged

Shortcode: Properly handle case where no attributes are passed #13432

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fd056ba
🐛 Fix fatal error when supplying empty string to `$attribute`
AnuragVasanwala Jul 25, 2023
3ccca19
🧪 Add test case to verify empty `$attribute`
AnuragVasanwala Jul 25, 2023
5b71257
Merge branch 'main' into 13431-fix-embed-shortcode-empty-attribute-fa…
AnuragVasanwala Jul 26, 2023
c245059
Merge branch 'main' into 13431-fix-embed-shortcode-empty-attribute-fa…
AnuragVasanwala Jul 26, 2023
33fc12f
♻️ Add spaces to align type description
AnuragVasanwala Jul 26, 2023
edce37b
♻️ Fix spaces
AnuragVasanwala Jul 26, 2023
b0978c2
🚮 Remove unnecessary unit test
AnuragVasanwala Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 8 additions & 3 deletions includes/Shortcode/Embed_Shortcode.php
View file
Open in desktop
Expand Up @@ -53,11 +53,16 @@
*
* @since 1.1.0
*
* @param array<string, string|int> $attributes Shortcode attributes.
* @param string $content Shortcode content.
* @param array<string, string|int>|string $attributes Shortcode attributes.
* @param string $content Shortcode content.
* @return string Rendered Shortcode
*/
public function render_shortcode( array $attributes, string $content ): string { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
public function render_shortcode( $attributes, string $content ): string { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
// Initialize '$attrs' when not an array OR is an empty string.
if ( empty( $attributes ) || ! \is_array( $attributes ) ) {
$attributes = [];

Check warning on line 63 in includes/Shortcode/Embed_Shortcode.php

View check run for this annotation

Codecov / codecov/patch

includes/Shortcode/Embed_Shortcode.php#L63 

Added line #L63 was not covered by tests
}

$attributes = shortcode_atts( $this->default_attrs(), $attributes, self::SHORTCODE_NAME );

$attributes['class'] = 'wp-shortcode-web-stories-embed';
Expand Down