Skip to:
Content

bbPress.org

Changeset 6164


Ignore:
Timestamp:
12/13/2016 09:08:01 AM (8 years ago)
Author:
xknown
Message:

Add PHP 5.x style constructors.

Keep also the PHP 4.x style constructors to avoid breaking code that depends on these methods.
See #3033

Location:
branches/1.2
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/1.2/bb-admin/includes/class.bb-install.php

    r2403 r6164  
    102102     * @return boolean Always returns true
    103103     */
    104     function BB_Install( $caller )
     104    function __construct( $caller )
    105105    {
    106106        $this->caller = $caller;
     
    160160
    161161        return true;
     162    }
     163
     164    function BB_Install( $caller ) {
     165        $this->__construct( $caller );
    162166    }
    163167
     
    12811285        require_once( BACKPRESS_PATH . 'class.bpdb-multi.php' );
    12821286
    1283         $bbdb =& new BPDB_Multi( array(
     1287        $bbdb = new BPDB_Multi( array(
    12841288            'name'     => BBDB_NAME,
    12851289            'user'     => BBDB_USER,
  • branches/1.2/bb-includes/class.bb-dir-map.php

    r2393 r6164  
    1515    var $_current_file;
    1616
    17     function BB_Dir_Map( $root, $args = '' ) {
     17    function __construct( $root, $args = '' ) {
    1818        if ( !is_dir( $root ) ) {
    1919            $this->error = new WP_Error( 'bb_dir_map', __('Not a valid directory') );
     
    2828        $this->_current_root = $this->root = rtrim($root, '/\\');
    2929        $this->map();
     30    }
     31
     32    function BB_Dir_Map( $root, $args = '' ) {
     33        $this->__construct( $root, $args );
    3034    }
    3135
  • branches/1.2/bb-includes/class.bb-locale.php

    r2167 r6164  
    352352     * @return BB_Locale
    353353     */
    354     function BB_Locale() {
     354    function __construct() {
    355355        $this->init();
    356356        $this->register_globals();
     357    }
     358
     359    function BB_Locale() {
     360        $this->__construct();
    357361    }
    358362}
  • branches/1.2/bb-includes/class.bb-query.php

    r3371 r6164  
    1717
    1818    // Can optionally pass unique id string to help out filters
    19     function BB_Query( $type = 'topic', $query = '', $id = '' ) {
     19    function __construct( $type = 'topic', $query = '', $id = '' ) {
    2020        $this->init( $type, $query, $id );
    2121
    2222        if ( !empty($this->query) )
    2323            $this->query();
     24    }
     25
     26    function BB_Query( $type = 'topic', $query = '', $id = '' ) {
     27        $this->__construct( $type, $query, $id );
    2428    }
    2529
     
    883887
    884888    // Can optionally pass unique id string to help out filters
    885     function BB_Query_Form( $type = 'topic', $defaults = '', $allowed = '', $id = '' ) {
     889    function __construct( $type = 'topic', $defaults = '', $allowed = '', $id = '' ) {
    886890        $this->defaults = wp_parse_args( $defaults );
    887891        $this->allowed  = wp_parse_args( $allowed );
    888892        if ( !empty($defaults) || !empty($allowed) )
    889893            $this->query_from_env($type, $defaults, $allowed, $id);
     894    }
     895
     896    function BB_Query_Form( $type = 'topic', $defaults = '', $allowed = '', $id = '' ) {
     897        $this->__construct( $type, $defaults, $allowed, $id );
    890898    }
    891899
  • branches/1.2/bb-includes/class.bb-walker.php

    r2395 r6164  
    163163    }
    164164
    165     function BB_Loop( &$elements ) {
     165    function __construct( &$elements ) {
    166166        $this->elements = $elements;
    167167        if ( !is_array($this->elements) || empty($this->elements) )
    168168            return $this->elements = false;
     169    }
     170
     171    function BB_Loop( &$elements ) {
     172        $this->__construct( $elements );
    169173    }
    170174
  • branches/1.2/bb-includes/functions.bb-deprecated.php

    r2475 r6164  
    890890if ( !class_exists( 'WP_User' ) ) : // Deprecated in BackPress not WordPress
    891891class WP_User extends BP_User {
     892    function __construct( $id, $name = '' ) {
     893        return parent::BP_User( $id, $name );
     894    }
    892895    function WP_User( $id, $name = '' ) {
    893         return parent::BP_User( $id, $name );
     896        $this->__construct( $id, $name );
    894897    }
    895898}
  • branches/1.2/xmlrpc.php

    r5611 r6164  
    105105     * @return void
    106106     */
    107     function BB_XMLRPC_Server()
     107    function __construct()
    108108    {
    109109        // bbPress publishing API
     
    174174    }
    175175
    176 
     176    function BB_XMLRPC_Server()
     177    {
     178        $this->__construct();
     179    }
    177180
    178181    /**
Note: See TracChangeset for help on using the changeset viewer.