Skip to content

notifications.php - fix old_status_friendly_name undefined warning #502

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
jerclarke wants to merge 1 commit into from
Closed

notifications.php - fix old_status_friendly_name undefined warning #502

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions modules/notifications/notifications.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,12 @@ function notification_status_change( $new_status, $old_status, $post ) {
$current_user_email = '';
}

// Set up default old and new status "friendly" names using it's label
$old_status_post_obj = get_post_status_object( $old_status );
$old_status_friendly_name = $old_status_post_obj->label;
$new_status_post_obj = get_post_status_object( $new_status );
$new_status_friendly_name = $new_status_post_obj->label;

// Email subject and first line of body
// Set message subjects according to what action is being taken on the Post
if ( $old_status == 'new' || $old_status == 'auto-draft' ) {
Expand Down Expand Up @@ -621,15 +627,10 @@ function notification_status_change( $new_status, $old_status, $post ) {
$subject = sprintf( __( '[%1$s] %2$s Status Changed for "%3$s"', 'edit-flow' ), $blogname, $post_type, $post_title );
/* translators: 1: post type, 2: post id, 3. post title, 4. user name, 5. user email */
$body .= sprintf( __( 'Status was changed for %1$s #%2$s "%3$s" by %4$s %5$s', 'edit-flow'), $post_type, $post_id, $post_title, $current_user_display_name, $current_user_email ) . "\r\n";
$old_status_post_obj = get_post_status_object( $old_status );
$old_status_friendly_name = $old_status_post_obj->label;
}

/* translators: 1: date, 2: time, 3: timezone */
$body .= sprintf( __( 'This action was taken on %1$s at %2$s %3$s', 'edit-flow' ), date_i18n( get_option( 'date_format' ) ), date_i18n( get_option( 'time_format' ) ), get_option( 'timezone_string' ) ) . "\r\n";

$new_status_post_obj = get_post_status_object( $new_status );
$new_status_friendly_name = $new_status_post_obj->label;

// Email body
$body .= "\r\n";
Expand Down