Changeset 2396

Timestamp:

01/28/2016 03:59:51 PM (8 years ago)

Author:

iandunn

Message:

WordCamp Budgets: Centralize get_requester_name().

Location:

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments

Files:

• includes/reimbursement-request.php (modified) (4 diffs)
• includes/wordcamp-budgets.php (modified) (1 diff)
• views/reimbursement-request/metabox-notes.php (modified) (1 diff)

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

@@ -223 +223 @@
 
 /**
- * Get the name of the requester
- *
- * @param int $post_author_id
- *
- * @return string
- */
-function get_requester_name( $post_author_id ) {
-    $requester_name = '';
-
-    $author = get_user_by( 'id', $post_author_id );
-
-    if ( is_a( $author, 'WP_User' ) ) {
-        $requester_name = $author->get( 'display_name' );
-    }
-
-    return $requester_name;
-}
-
-/**
  * Determine if the current user can submit changes to the given Reimbursement Request
  *
@@ -271 +252 @@
     $status_name        = get_status_name( $post->post_status );
     $request_id         = get_current_blog_id() . '-' . $post->ID;
-    $requested_by       = get_requester_name( $post->post_author );
+    $requested_by       = \WordCamp_Budgets::get_requester_name( $post->post_author );
     $delete_text        = EMPTY_TRASH_DAYS ? __( 'Move to Trash' ) : __( 'Delete Permanently' );
     $update_text        = current_user_can( 'manage_network' ) ? __( 'Update Request', 'wordcamporg' ) : __( 'Send Request', 'wordcamporg' );
@@ -338 +319 @@
 
     if ( empty ( $name_of_payer ) ) {
-        $name_of_payer = get_requester_name( $post->post_author );
+        $name_of_payer = \WordCamp_Budgets::get_requester_name( $post->post_author );
     }
 
@@ -602 +583 @@
 
     $subject          = 'New note on ' . sanitize_text_field( $request->post_title );
-    $note_author_name = get_requester_name( $note['author_id'] );
+    $note_author_name = \WordCamp_Budgets::get_requester_name( $note['author_id'] );
     $request_url      = admin_url( sprintf( 'post.php?post=%s&action=edit', $request->ID ) );
     $headers          = array( 'Reply-To: support@wordcamp.org' );

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

@@ -369 +369 @@
 
     /**
+     * Get the name of the requester
+     *
+     * @param int $post_author_id
+     *
+     * @return string
+     */
+    public static function get_requester_name( $post_author_id ) {
+        $requester_name = '';
+
+        $author = get_user_by( 'id', $post_author_id );
+
+        if ( is_a( $author, 'WP_User' ) ) {
+            $requester_name = $author->get( 'display_name' );
+        }
+
+        return $requester_name;
+    }
+
+    /**
      * Get the e-mail address of the requester in `Name <address>` format
      *

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/reimbursement-request/metabox-notes.php

@@ -16 +16 @@
             <span class="wcbrr-note-meta">
                 <?php echo esc_html( date( 'Y-m-d', $note['timestamp'] ) ); ?>
-                <?php echo esc_html( get_requester_name( $note['author_id'] ) ); ?>:
+                <?php echo esc_html( \WordCamp_Budgets::get_requester_name( $note['author_id'] ) ); ?>:
             </span>