Skip to:
Content

bbPress.org

Changeset 3376


Ignore:
Timestamp:
07/25/2011 06:40:41 AM (11 years ago)
Author:
johnjamesjacoby
Message:

Rename remaining functions prefixed with an underscore.

Location:
branches/plugin
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • branches/plugin/bbp-admin/bbp-admin.php

    r3375 r3376  
    4343
    4444    /**
    45      * The main bbPress admin loader (PHP4 compat)
     45     * The main bbPress admin loader
    4646     *
    4747     * @since bbPress (r2515)
    4848     *
    49      * @uses BBP_Admin::_setup_globals() Setup the globals needed
    50      * @uses BBP_Admin::_includes() Include the required files
    51      * @uses BBP_Admin::_setup_actions() Setup the hooks and actions
    52      */
    53     public function BBP_Admin() {
    54         $this->__construct();
    55     }
    56 
    57     /**
    58      * The main bbPress admin loader
    59      *
    60      * @since bbPress (r2515)
    61      *
    62      * @uses BBP_Admin::_setup_globals() Setup the globals needed
    63      * @uses BBP_Admin::_includes() Include the required files
    64      * @uses BBP_Admin::_setup_actions() Setup the hooks and actions
     49     * @uses BBP_Admin::setup_globals() Setup the globals needed
     50     * @uses BBP_Admin::includes() Include the required files
     51     * @uses BBP_Admin::setup_actions() Setup the hooks and actions
    6552     */
    6653    public function __construct() {
  • branches/plugin/bbp-admin/bbp-forums.php

    r3343 r3376  
    3131
    3232    /**
    33      * The main bbPress forums admin loader (PHP4 compat)
     33     * The main bbPress forums admin loader
    3434     *
    3535     * @since bbPress (r2515)
    3636     *
    37      * @uses BBP_Forums_Admin::_setup_globals() Setup the globals needed
    38      * @uses BBP_Forums_Admin::_setup_actions() Setup the hooks and actions
    39      */
    40     function BBP_Forums_Admin() {
    41         $this->__construct();
    42     }
    43 
    44     /**
    45      * The main bbPress forums admin loader
    46      *
    47      * @since bbPress (r2515)
    48      *
    49      * @uses BBP_Forums_Admin::_setup_globals() Setup the globals needed
    50      * @uses BBP_Forums_Admin::_setup_actions() Setup the hooks and actions
     37     * @uses BBP_Forums_Admin::setup_globals() Setup the globals needed
     38     * @uses BBP_Forums_Admin::setup_actions() Setup the hooks and actions
     39     * @uses BBP_Forums_Admin::setup_help() Setup the help text
    5140     */
    5241    function __construct() {
    53         $this->_setup_globals();
    54         $this->_setup_actions();
    55         $this->_setup_help();
     42        $this->setup_globals();
     43        $this->setup_actions();
     44        $this->setup_help();
    5645    }
    5746
     
    6857     * @uses bbp_get_reply_post_type() To get the reply post type
    6958     */
    70     function _setup_actions() {
     59    function setup_actions() {
    7160
    7261        // Add some general styling to the admin area
     
    9483     * @access private
    9584     */
    96     function _setup_globals() {
     85    function setup_globals() {
    9786
    9887        // Setup the post type for this admin component
     
    10695     * @access private
    10796     */
    108     function _setup_help() {
     97    function setup_help() {
    10998
    11099        // Define local variable(s)
  • branches/plugin/bbp-admin/bbp-replies.php

    r3364 r3376  
    3131
    3232    /**
    33      * The main bbPress admin loader (PHP4 compat)
     33     * The main bbPress admin loader
    3434     *
    3535     * @since bbPress (r2515)
    3636     *
    37      * @uses BBP_Replies_Admin::_setup_globals() Setup the globals needed
    38      * @uses BBP_Topics_Admin::_setup_actions() Setup the hooks and actions
    39      */
    40     function BBP_Replies_Admin() {
    41         $this->__construct();
    42     }
    43 
    44     /**
    45      * The main bbPress admin loader
    46      *
    47      * @since bbPress (r2515)
    48      *
    49      * @uses BBP_Replies_Admin::_setup_globals() Setup the globals needed
    50      * @uses BBP_Replies_Admin::_setup_actions() Setup the hooks and actions
     37     * @uses BBP_Replies_Admin::setup_globals() Setup the globals needed
     38     * @uses BBP_Replies_Admin::setup_actions() Setup the hooks and actions
     39     * @uses BBP_Replies_Admin::setup_actions() Setup the help text
    5140     */
    5241    function __construct() {
    53         $this->_setup_globals();
    54         $this->_setup_actions();
    55         $this->_setup_help();
     42        $this->setup_globals();
     43        $this->setup_actions();
     44        $this->setup_help();
    5645    }
    5746
     
    6857     * @uses bbp_get_reply_post_type() To get the reply post type
    6958     */
    70     function _setup_actions() {
     59    function setup_actions() {
    7160
    7261        // Add some general styling to the admin area
     
    10695     * @access private
    10796     */
    108     function _setup_globals() {
     97    function setup_globals() {
    10998
    11099        // Setup the post type for this admin component
     
    118107     * @access private
    119108     */
    120     function _setup_help() {
     109    function setup_help() {
    121110
    122111        // Define local variable(s)
  • branches/plugin/bbp-admin/bbp-topics.php

    r3348 r3376  
    3131
    3232    /**
    33      * The main bbPress topics admin loader (PHP4 compat)
     33     * The main bbPress topics admin loader
    3434     *
    3535     * @since bbPress (r2515)
    3636     *
    37      * @uses BBP_Topics_Admin::_setup_globals() Setup the globals needed
    38      * @uses BBP_Topics_Admin::_setup_actions() Setup the hooks and actions
    39      */
    40     function BBP_Topics_Admin() {
    41         $this->__construct();
    42     }
    43 
    44     /**
    45      * The main bbPress topics admin loader
    46      *
    47      * @since bbPress (r2515)
    48      *
    49      * @uses BBP_Topics_Admin::_setup_globals() Setup the globals needed
    50      * @uses BBP_Topics_Admin::_setup_actions() Setup the hooks and actions
     37     * @uses BBP_Topics_Admin::setup_globals() Setup the globals needed
     38     * @uses BBP_Topics_Admin::setup_actions() Setup the hooks and actions
     39     * @uses BBP_Topics_Admin::setup_help() Setup the help text
    5140     */
    5241    function __construct() {
    53         $this->_setup_globals();
    54         $this->_setup_actions();
    55         $this->_setup_help();
     42        $this->setup_globals();
     43        $this->setup_actions();
     44        $this->setup_help();
    5645    }
    5746
     
    6857     * @uses bbp_get_reply_post_type() To get the reply post type
    6958     */
    70     function _setup_actions() {
     59    function setup_actions() {
    7160
    7261        // Add some general styling to the admin area
     
    10695     * @access private
    10796     */
    108     function _setup_globals() {
     97    function setup_globals() {
    10998
    11099        // Setup the post type for this admin component
     
    118107     * @access private
    119108     */
    120     function _setup_help() {
     109    function setup_help() {
    121110
    122111        // Define local variable(s)
  • branches/plugin/bbp-admin/bbp-users.php

    r3350 r3376  
    2626
    2727    /**
    28      * The bbPress users admin loader (PHP4 compat)
    29      *
    30      * @since bbPress (r2515)
    31      *
    32      * @uses BBP_Users_Admin::_setup_globals() Setup the globals needed
    33      * @uses BBP_Users_Admin::_setup_actions() Setup the hooks and actions
    34      */
    35     function BBP_Users_Admin() {
    36         $this->__construct();
    37     }
    38 
    39     /**
    4028     * The bbPress users admin loader
    4129     *
    4230     * @since bbPress (r2515)
    4331     *
    44      * @uses BBP_Users_Admin::_setup_globals() Setup the globals needed
    45      * @uses BBP_Users_Admin::_setup_actions() Setup the hooks and actions
     32     * @uses BBP_Users_Admin::setup_globals() Setup the globals needed
     33     * @uses BBP_Users_Admin::setup_actions() Setup the hooks and actions
    4634     */
    4735    function __construct() {
    48         $this->_setup_globals();
    49         $this->_setup_actions();
     36        $this->setup_globals();
     37        $this->setup_actions();
    5038    }
    5139
     
    5846     * @uses add_action() To add various actions
    5947     */
    60     function _setup_actions() {
     48    function setup_actions() {
    6149
    6250        // User profile edit/display actions
     
    7563     * @access private
    7664     */
    77     function _setup_globals() { }
     65    function setup_globals() { }
    7866
    7967    /**
  • branches/plugin/bbp-admin/importers/bbpress.php

    r3375 r3376  
    3131
    3232        $args = func_get_args();
    33         $args = call_user_func_array( array( &$this, '_init' ), $args );
     33        $args = call_user_func_array( array( &$this, 'init' ), $args );
    3434
    3535        if ( $args['host'] )
     
    5555     * Based on, and taken from, the BackPress class in turn taken from the 1.0 branch of bbPress.
    5656     */
    57     function _init( $args )
     57    function init( $args )
    5858    {
    5959        if ( 4 == func_num_args() ) {
  • branches/plugin/bbp-includes/bbp-core-akismet.php

    r3348 r3376  
    2323
    2424    /**
    25      * The main bbPress Akismet loader (PHP4 compat)
     25     * The main bbPress Akismet loader
    2626     *
    2727     * @since bbPress (r3277)
    28      */
    29     function BBP_Akismet() {
    30         $this->__construct();
    31     }
    32 
    33     /**
    34      * The main bbPress Akismet loader
    35      *
    36      * @since bbPress (r3277)
    3728     *
    3829     * @uses add_filter()
    3930     */
    4031    function __construct() {
    41         $this->_setup_actions();
     32        $this->setup_actions();
    4233    }
    4334
     
    5142     * @uses add_action() To add various actions
    5243     */
    53     function _setup_actions() {
     44    function setup_actions() {
    5445
    5546        // Bail if no akismet
  • branches/plugin/bbp-includes/bbp-core-classes.php

    r3243 r3376  
    6565     *  - query: The loop for this component (WP_Query)
    6666     *  - current_id: The current ID of the queried object
    67      * @uses BBP_Component::_setup_globals() Setup the globals needed
    68      * @uses BBP_Component::_includes() Include the required files
    69      * @uses BBP_Component::_setup_actions() Setup the hooks and actions
     67     * @uses BBP_Component::setup_globals() Setup the globals needed
     68     * @uses BBP_Component::includes() Include the required files
     69     * @uses BBP_Component::setup_actions() Setup the hooks and actions
    7070     */
    7171    function BBP_Component( $args = '' ) {
     
    7373            return;
    7474
    75         $this->_setup_globals( $args );
    76         $this->_includes();
    77         $this->_setup_actions();
     75        $this->setup_globals( $args );
     76        $this->includes();
     77        $this->setup_actions();
    7878    }
    7979
     
    8787     * @uses apply_filters() Calls 'bbp_{@link BBP_Component::name}_slug'
    8888     */
    89     function _setup_globals( $args = '' ) {
     89    function setup_globals( $args = '' ) {
    9090        $this->name = $args['name'];
    9191        $this->id   = apply_filters( 'bbp_' . $this->name . '_id',   $args['id']   );
     
    9999     * @access private
    100100     *
    101      * @uses do_action() Calls 'bbp_{@link BBP_Component::name}_includes'
    102      */
    103     function _includes() {
    104         do_action( 'bbp_' . $this->name . '_includes' );
     101     * @uses do_action() Calls 'bbp_{@link BBP_Component::name}includes'
     102     */
     103    function includes() {
     104        do_action( 'bbp_' . $this->name . 'includes' );
    105105    }
    106106
     
    113113     * @uses add_action() To add various actions
    114114     * @uses do_action() Calls
    115      *                    'bbp_{@link BBP_Component::name}_setup_actions'
    116      */
    117     function _setup_actions() {
     115     *                    'bbp_{@link BBP_Component::name}setup_actions'
     116     */
     117    function setup_actions() {
    118118        // Register post types
    119119        add_action( 'bbp_register_post_types',      array ( $this, 'register_post_types'      ), 10, 2 );
     
    129129
    130130        // Additional actions can be attached here
    131         do_action( 'bbp_' . $this->name . '_setup_actions' );
     131        do_action( 'bbp_' . $this->name . 'setup_actions' );
    132132    }
    133133
  • branches/plugin/bbp-includes/bbp-core-hooks.php

    r3374 r3376  
    1313 * There are a few common places that additional actions can currently be found
    1414 *
    15  *  - bbPress: In {@link bbPress::_setup_actions()} in bbpress.php
    16  *  - Component: In {@link BBP_Component::_setup_actions()} in
     15 *  - bbPress: In {@link bbPress::setup_actions()} in bbpress.php
     16 *  - Component: In {@link BBP_Component::setup_actions()} in
    1717 *                bbp-includes/bbp-classes.php
    18  *  - Admin: More in {@link BBP_Admin::_setup_actions()} in
     18 *  - Admin: More in {@link BBP_Admin::setup_actions()} in
    1919 *            bbp-admin/bbp-admin.php
    2020 */
  • branches/plugin/bbp-includes/bbp-core-shortcodes.php

    r3348 r3376  
    3333     * @since bbPress (r3031)
    3434     *
    35      * @uses __construct()
    36      */
    37     public function BBP_Shortcodes() {
    38         $this->__construct();
    39     }
    40 
    41     /**
    42      * Add the register_shortcodes action to bbp_init
    43      *
    44      * @since bbPress (r3031)
    45      *
    46      * @uses _setup_globals()
    47      * @uses _add_shortcodes()
     35     * @uses setup_globals()
     36     * @uses add_shortcodes()
    4837     */
    4938    public function __construct() {
  • branches/plugin/bbpress.php

    r3359 r3376  
    289289     * @since bbPress (r2464)
    290290     *
    291      * @uses bbPress::_setup_globals() Setup the globals needed
    292      * @uses bbPress::_includes() Include the required files
    293      * @uses bbPress::_setup_actions() Setup the hooks and actions
     291     * @uses bbPress::setup_globals() Setup the globals needed
     292     * @uses bbPress::includes() Include the required files
     293     * @uses bbPress::setup_actions() Setup the hooks and actions
    294294     */
    295295    public function __construct() {
Note: See TracChangeset for help on using the changeset viewer.