Changeset 3139317

Timestamp:

08/21/2024 10:38:08 PM (19 months ago)

Author:

mdawaffe

Message:

PHP8 Compatibility fixes

Props sixhours

File:

• email-post-changes/trunk/class.email-post-changes.php (modified) (7 diffs)

email-post-changes/trunk/class.email-post-changes.php

@@ -94 +94 @@
         // If this is a new post, set an empty title for $this->left_post so that it appears in the diff.
         $child_posts = wp_get_post_revisions( $post_id, array( 'numberposts' => 1 ) );
-        if ( count( $child_posts ) == 0 ) {
+        if ( ( is_countable( $child_posts ) ? count( $child_posts ) : 0 ) == 0 ) {
             $this->left_post->post_title = '';
         }
@@ -160 +160 @@
 
         $emails = array_unique( array_merge( $options['emails'], $user_emails ) );
-        if ( ! count( $emails ) && apply_filters( 'email_post_changes_admin_email_fallback', true ) )
+        if ( $emails === [] && apply_filters( 'email_post_changes_admin_email_fallback', true ) ) {
             $emails[] = get_option( 'admin_email' );
-
+        }
         $emails = apply_filters( 'email_post_changes_emails', $emails, $this->left_post->ID, $this->right_post->ID );
 
@@ -311 +311 @@
 
         if ( empty( $options['emails'] ) ) {
-            if ( count( $return['users'] ) )
+            if ( is_countable( $return['users'] ) ? count( $return['users'] ) : 0 ) {
                 $return['emails'] = array();
-            else
+            } else {
                 $return['emails'] = $this->defaults['emails'];
+            }
         } else {
             $_emails = is_string( $options['emails'] ) ? preg_split( '(\n|\r)', $options['emails'], -1, PREG_SPLIT_NO_EMPTY ) : array();
@@ -325 +326 @@
                 $return['invalid_emails'] = $invalid_emails;
 
-            if ( $emails )
+            if ( $emails ) {
                 $return['emails'] = $emails;
-            elseif ( count( $return['users'] ) )
+            } elseif ( is_countable( $return['users'] ) ? count( $return['users'] ) : 0 ) {
                 $return['emails'] = array();
-            else
+            } else {
                 $return['emails'] = $this->defaults['emails'];
+            }
 
             // Don't store a huge list of invalid emails addresses in the option
@@ -339 +341 @@
 
             // Cap to at max 200 email addresses
-            if ( count( $return['emails'] ) > 200 ) {
+            if ( ( is_countable( $return['emails'] ) ? count( $return['emails'] ) : 0 ) > 200 ) {
                 $return['emails'] = array_slice( $return['emails'], 0, 200 );
             }
@@ -389 +391 @@
 <?php   if ( !empty( $options['invalid_emails'] ) && $_GET['settings-updated'] ) : ?>
     <div class="error">
-        <p><?php printf( _n( 'Invalid Email: %s', 'Invalid Emails: %s', count( $options['invalid_emails'] ) ), '<kbd>' . join( '</kbd>, <kbd>', array_map( 'esc_html', $options['invalid_emails'] ) ) ); ?></p>
+        <p><?php printf( _n( 'Invalid Email: %s', 'Invalid Emails: %s', is_countable( $options['invalid_emails'] ) ? count( $options['invalid_emails'] ) : 0 ), '<kbd>' . implode( '</kbd>, <kbd>', array_map( 'esc_html', $options['invalid_emails'] ) ) ); ?></p>
     </div>
 <?php   endif; ?>
@@ -448 +450 @@
         $options = $this->get_options();
 ?>
-        <textarea class="epc-additional-emails" rows="4" cols="40" name="email_post_changes[emails]"><?php echo esc_html( join( "\n", $options['emails'] ) ); ?></textarea>
+        <textarea class="epc-additional-emails" rows="4" cols="40" name="email_post_changes[emails]"><?php echo esc_html( implode( "\n", $options['emails'] ) ); ?></textarea>
         <p class="description"><?php _e( 'One email address per line.' ); ?></p>
 <?php