Changeset 2887

Timestamp:

04/04/2016 06:45:27 PM (11 years ago)

Author:

iandunn

Message:

WordCamp Post Type: Add some comments and cleanup whitespace.

Location:

sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt

Files:

• wcpt-loader.php (modified) (1 diff)
• wcpt-wordcamp/wordcamp-loader.php (modified) (2 diffs)

sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-loader.php

@@ -49 +49 @@
                 require_once ( WCPT_DIR . 'applications/tracker.php' );
                 require_once ( WCPT_DIR . 'applications/wordcamp.php' );
+                // todo review the full diff against trunk before merging
 
                 // Require admin files.

sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-loader.php

@@ -131 +131 @@
                         'wcpt-interview-sched' => _x( 'Interview/Orientation Scheduled',             'wordcamp status', 'wordcamporg' ),
                         'wcpt-rejected'        => _x( 'Rejected',                                    'wordcamp status', 'wordcamporg' ),
-                        'wcpt-cancelled'       => _x( 'Cancelled', 'wordcamp status', 'wordcamporg' ),
+                        'wcpt-cancelled'       => _x( 'Cancelled',                                   'wordcamp status', 'wordcamporg' ),
                         'wcpt-approved-pre-pl' => _x( 'Approved for Pre-Planning Pending Agreement', 'wordcamp status', 'wordcamporg' ),
                         'wcpt-needs-email'     => _x( 'Needs E-mail Address',                        'wordcamp status', 'wordcamporg' ),
@@ -233 +233 @@
                         'wcpt-needs-vetting'   => array( 'wcpt-needs-orientati', 'wcpt-more-info-reque', 'wcpt-needs-rejection' ),
                         'wcpt-needs-orientati' => array( 'wcpt-needs-vetting', 'wcpt-interview-sched' ),
-                        'wcpt-more-info-reque' => array(),
+                        'wcpt-more-info-reque' => array(),  // Allowed from any status, see below
                         'wcpt-needs-rejection' => array( 'wcpt-needs-vetting', 'wcpt-rejected' ),
                         'wcpt-interview-sched' => array( 'wcpt-needs-orientati', 'wcpt-approved-pre-pl' ),
                         'wcpt-rejected'        => array( 'wcpt-needs-rejection' ),
-                        'wcpt-cancelled'       => array(),
+                        'wcpt-cancelled'       => array(),  // Allowed from any status, see below
                         'wcpt-approved-pre-pl' => array( 'wcpt-interview-sched', 'wcpt-needs-email' ),
                         'wcpt-needs-email'     => array( 'wcpt-approved-pre-pl', 'wcpt-needs-site' ),