Changeset 2296 for sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php

Timestamp:

01/14/2016 03:21:54 PM (10 years ago)

Author:

iandunn

Message:

WordCamp Budgets: Centralize get_requester_formatted_email() for all modules.

File:

• sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php (modified) (4 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php

@@ -435 +435 @@
 
             case 'requester':
-                $value = $this->get_requester_formatted_email( $post->post_author );
+                $value = WordCamp_Budgets::get_requester_formatted_email( $post->post_author );
                 break;
 
@@ -477 +477 @@
 
         return $value;
-    }
-
-    /**
-     * Get the e-mail address of the requester in `Name <address>` format
-     *
-     * @param int $post_author_id
-     *
-     * @return false|string
-     */
-    protected function get_requester_formatted_email( $post_author_id ) {
-        $address   = false;
-        $requester = get_user_by( 'id', $post_author_id );
-
-        if ( is_a( $requester, 'WP_User' ) ) {
-            $address = sprintf( '%s <%s>', $requester->get( 'display_name' ), $requester->get( 'user_email' ) );
-        }
-
-        return $address;
     }
 
@@ -599 +581 @@
      */
     protected function notify_requester_payment_made( $request_id, $post_data ) {
-        if ( ! $to = $this->get_requester_formatted_email( $post_data['post_author'] ) ) {
+        if ( ! $to = WordCamp_Budgets::get_requester_formatted_email( $post_data['post_author'] ) ) {
             return;
         }
@@ -630 +612 @@
      */
     protected function notify_requester_request_incomplete( $request_id, $post_data, $post_data_raw ) {
-        if ( ! $to = $this->get_requester_formatted_email( $post_data['post_author'] ) ) {
+        if ( ! $to = WordCamp_Budgets::get_requester_formatted_email( $post_data['post_author'] ) ) {
             return;
         }