Skip to content

Photo Directory: refuse submitted shortcodes instead of editing them out #875

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

Closed
obenland wants to merge 3 commits into from
Closed

Photo Directory: refuse submitted shortcodes instead of editing them out #875

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6144b0d
Photo Directory: Refuse submitted shortcodes instead of editing them out
obenland Sep 4, 2026
b78be13
Photo Directory: Only run the shortcode check over submitted strings
obenland Sep 4, 2026
8e554e9
Photo Directory: Correct why the shortcode check skips non-strings
obenland Sep 4, 2026
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
21 changes: 18 additions & 3 deletions wordpress.org/public_html/wp-content/plugins/photo-directory/inc/uploads.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,9 @@ public static function customize_fu_response_notices( $notices ) {
case 'file-not-jpg':
$rejection = __( 'Your submission must be an image in the JPEG format.', 'wporg-photos' );
break;
case 'shortcode-in-text':
$rejection = __( 'The title, description, and caption cannot contain shortcodes. Please remove them and submit again.', 'wporg-photos' );
break;
case 'file-too-large':
$rejection = sprintf(
__( 'The file size for your submission is too large. Please submit a photo smaller than %d MB in size.', 'wporg-photos' ),
Expand Down Expand Up @@ -498,9 +501,7 @@ public static function sanitize_submitted_description( $post_array ) {
continue;
}

$value = $sanitize( wp_unslash( $post_array[ $field ] ) );

$post_array[ $field ] = wp_slash( strip_shortcodes( $value ) );
$post_array[ $field ] = wp_slash( $sanitize( wp_unslash( $post_array[ $field ] ) ) );
}

return $post_array;
Expand Down Expand Up @@ -702,6 +703,20 @@ protected static function validate_upload_form() {
return 'checkbox_unchecked_license';
}

foreach ( [ 'post_title', 'post_content', 'post_excerpt' ] as $field ) {
// phpcs:ignore WordPress.Security.NonceVerification.Missing, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- Read raw: sanitizing before the check would hide what it looks for.
$submitted = isset( $_POST[ $field ] ) ? wp_unslash( $_POST[ $field ] ) : '';

// A field can arrive as an array, which Frontend Uploader drops before it builds the post.
if ( ! is_string( $submitted ) || '' === $submitted ) {
continue;
}

if ( preg_match( '/' . get_shortcode_regex() . '/', $submitted ) ) {
return 'shortcode-in-text';
}
}

return false;
}

Expand Down