Ticket #2584: 2584.patch

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-moderation/inc/class-plugin.php

@@ -22 +22 @@
         // Meta key to store moderator's username on flag/unflag actions.
         const MODERATOR_META = '_wporg_bbp_moderator';
 
+        // Meta key to store moderation date on flag/unflag actions.
+        const MODERATION_DATE_META = '_wporg_bbp_moderation_date';
+
         /**
          * Always return the same instance of this plugin.
          *
@@ -232 +235 @@
                 if ( ! $this->is_user_flagged( $user_id ) ) {
                         update_user_meta( $user_id, self::USER_META, true );
                         update_user_meta( $user_id, self::MODERATOR_META, wp_get_current_user()->user_nicename );
+                        update_user_meta( $user_id, self::MODERATION_DATE_META, current_time( 'mysql' ) );
                 }
                 do_action( 'wporg_bbp_flag_user', $user_id );
 
@@ -246 +250 @@
                 if ( $this->is_user_flagged( $user_id ) ) {
                         delete_user_meta( $user_id, self::USER_META );
                         update_user_meta( $user_id, self::MODERATOR_META, wp_get_current_user()->user_nicename );
+                        update_user_meta( $user_id, self::MODERATION_DATE_META, current_time( 'mysql' ) );
                 }
                 do_action( 'wporg_bbp_unflag_user', $user_id );
 

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/user-profile.php

@@ -15 +15 @@
                 if ( current_user_can( 'moderate' ) && class_exists( 'WordPressdotorg\Forums\User_Moderation\Plugin' ) ) {
                         $is_user_flagged = WordPressdotorg\Forums\User_Moderation\Plugin::get_instance()->is_user_flagged( bbp_get_displayed_user_id() );
                         $moderator       = get_user_meta( bbp_get_displayed_user_id(), WordPressdotorg\Forums\User_Moderation\Plugin::MODERATOR_META, true );
+                        $moderation_date = get_user_meta( bbp_get_displayed_user_id(), WordPressdotorg\Forums\User_Moderation\Plugin::MODERATION_DATE_META, true );
 
                         if ( $is_user_flagged ) {
-                                if ( $moderator ) {
+                                if ( $moderator && $moderation_date ) {
                                         $msg = sprintf(
+                                                /* translators: 1: linked moderator's username, 2: moderation date, 3: moderation time */
+                                                __( 'This user has been flagged by %1$s on %2$s at %3$s.', 'wporg-forums' ),
+                                                sprintf( '<a href="%s">%s</a>', esc_url( home_url( "/users/$moderator/" ) ), $moderator ),
+                                                /* translators: localized date format, see https://secure.php.net/date */
+                                                mysql2date( __( 'F j, Y', 'wporg-forums' ), $moderation_date ),
+                                                /* translators: localized time format, see https://secure.php.net/date */
+                                                mysql2date( __( 'g:i a', 'wporg-forums' ), $moderation_date )
+                                        );
+                                } elseif ( $moderator ) {
+                                        $msg = sprintf(
                                                 /* translators: %s: linked moderator's username */
                                                 __( 'This user has been flagged by %s.', 'wporg-forums' ),
                                                 sprintf( '<a href="%s">%s</a>', esc_url( home_url( "/users/$moderator/" ) ), $moderator )

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php

@@ -309 +309 @@
                 if ( class_exists( 'WordPressdotorg\Forums\User_Moderation\Plugin' ) ) :
                         $is_user_flagged = WordPressdotorg\Forums\User_Moderation\Plugin::get_instance()->is_user_flagged( get_post()->post_author );
                         $moderator       = get_user_meta( get_post()->post_author, WordPressdotorg\Forums\User_Moderation\Plugin::MODERATOR_META, true );
+                        $moderation_date = get_user_meta( get_post()->post_author, WordPressdotorg\Forums\User_Moderation\Plugin::MODERATION_DATE_META, true );
 
                         if ( $is_user_flagged ) {
-                                if ( $moderator ) {
+                                if ( $moderator && $moderation_date ) {
                                         $notices[] = sprintf(
+                                                /* translators: 1: linked moderator's username, 2: moderation date, 3: moderation time */
+                                                __( 'This user has been flagged by %1$s on %2$s.', 'wporg-forums' ),
+                                                sprintf( '<a href="%s">%s</a>', esc_url( home_url( "/users/$moderator/" ) ), $moderator ),
+                                                /* translators: localized date format, see https://secure.php.net/date */
+                                                mysql2date( __( 'F j, Y', 'wporg-forums' ), $moderation_date ),
+                                                /* translators: localized time format, see https://secure.php.net/date */
+                                                mysql2date( __( 'g:i a', 'wporg-forums' ), $moderation_date )
+                                        );
+                                } elseif ( $moderator ) {
+                                        $notices[] = sprintf(
                                                 /* translators: %s: linked moderator's username */
                                                 __( 'This user has been flagged by %s.', 'wporg-forums' ),
                                                 sprintf( '<a href="%s">%s</a>', esc_url( home_url( "/users/$moderator/" ) ), $moderator )