Changeset 12107

Timestamp:

10/07/2022 06:20:28 AM (4 years ago)

Author:

coffee2code

Message:

Photo Directory, Moderation/Rejection: Email contributor of published photo if the photo has subsequently been rejected.

The email is identical to a rejection email but with a line added "Though this photo had already been approved, we have since decided to decline it and have unpublished it from the site.". As such, a required rejection reason and optional mod note to user will be included.

Props topher1kenobe, coffee2code.
Fixes #6365.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc

Files:

• moderation.php (modified) (2 diffs)
• rejection.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/moderation.php

@@ -309 +309 @@
                 }
 
-                // Bail if user has already been emailed.
-                if  ( self::has_user_been_emailed( $post ) ) {
-                        return;
-                }
-
                 $user = get_user_by( 'id', $post->post_author );
 
                 $rejection_message = '';
+
+                // Add verbiage to acknowledge if photo was previously published prior
+                // to its rejection.
+                if ( self::has_user_been_emailed( $post ) ) {
+                        $rejection_message .= __( 'Though this photo had already been approved, we have since decided to decline it and have unpublished it from the site.', 'wporg-photos' ) . "\n";
+                } else {
+                        $rejection_message .= __( 'The photo has been declined and will not be published to the site.', 'wporg-photos' ) . "\n";
+                }
 
                 // Check for specifics provided by the moderator regarding the rejection.
@@ -352 +355 @@
 Thank you for submitting a photo to the WordPress Photo Directory.
 
-The photo has been declined and will not be published to the site.
 %2$s
 Submission date: %3$s

sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/rejection.php

@@ -848 +848 @@
                 echo '<label for="moderator_note_to_user">' . __( '(Optional) Note to user:', 'wporg-photos' );
                 echo '<p class="description"><em>' . __( 'Included in approval/rejection email.', 'wporg-photos' ) . '</em></p>';
-                // Currently no email is sent if photo changes state from being published, so don't allow the field to be set.
-                $is_note_to_user_disabled = $is_disabled || ( 'publish' === get_post_status( $post ) );
-                echo '<textarea id="moderator_note_to_user" name="moderator_note_to_user" rows="4"' . disabled( true, $is_note_to_user_disabled, false ) . '>';
+                echo '<textarea id="moderator_note_to_user" name="moderator_note_to_user" rows="4"' . disabled( true, $is_disabled, false ) . '>';
                 echo esc_textarea( self::get_moderator_note_to_user( $post ) );
                 echo '</textarea>';