Changeset 6153

Timestamp:

12/09/2016 01:58:10 PM (6 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.1

Files:

• bb-admin/includes/class.bb-install.php (modified) (3 diffs)
• bb-includes/class.bb-dir-map.php (modified) (2 diffs)
• bb-includes/class.bb-locale.php (modified) (1 diff)
• bb-includes/class.bb-query.php (modified) (2 diffs)
• bb-includes/class.bb-walker.php (modified) (1 diff)
• bb-includes/functions.bb-deprecated.php (modified) (1 diff)
• xmlrpc.php (modified) (2 diffs)

branches/1.1/bb-admin/includes/class.bb-install.php

@@ -102 +102 @@
      * @return boolean Always returns true
      */
-    function BB_Install( $caller )
+    function __construct( $caller )
     {
         $this->caller = $caller;
@@ -160 +160 @@
 
         return true;
+    }
+
+    function BB_Install( $caller ) {
+        $this->__construct( $caller );
     }
 
@@ -1281 +1285 @@
         require_once( BACKPRESS_PATH . 'class.bpdb-multi.php' );
 
-        $bbdb =& new BPDB_Multi( array(
+        $bbdb = new BPDB_Multi( array(
             'name'     => BBDB_NAME,
             'user'     => BBDB_USER,

branches/1.1/bb-includes/class.bb-dir-map.php

@@ -15 +15 @@
     var $_current_file;
 
-    function BB_Dir_Map( $root, $args = '' ) {
+    function __construct( $root, $args = '' ) {
         if ( !is_dir( $root ) ) {
             $this->error = new WP_Error( 'bb_dir_map', __('Not a valid directory') );
@@ -28 +28 @@
         $this->_current_root = $this->root = rtrim($root, '/\\');
         $this->map();
+    }
+
+    function BB_Dir_Map( $root, $args = '' ) {
+        $this->__construct( $root, $args );
     }
 

branches/1.1/bb-includes/class.bb-locale.php

@@ -352 +352 @@
      * @return BB_Locale
      */
-    function BB_Locale() {
+    function __construct() {
         $this->init();
         $this->register_globals();
+    }
+
+    function BB_Locale() {
+        $this->__construct();
     }
 }

branches/1.1/bb-includes/class.bb-query.php

@@ -17 +17 @@
 
     // Can optionally pass unique id string to help out filters
-    function BB_Query( $type = 'topic', $query = '', $id = '' ) {
+    function __construct( $type = 'topic', $query = '', $id = '' ) {
         $this->init( $type, $query, $id );
 
         if ( !empty($this->query) )
             $this->query();
+    }
+
+    function BB_Query( $type = 'topic', $query = '', $id = '' ) {
+        $this->__construct( $type, $query, $id );
     }
 
@@ -883 +887 @@
 
     // Can optionally pass unique id string to help out filters
-    function BB_Query_Form( $type = 'topic', $defaults = '', $allowed = '', $id = '' ) {
+    function __construct( $type = 'topic', $defaults = '', $allowed = '', $id = '' ) {
         $this->defaults = wp_parse_args( $defaults );
         $this->allowed  = wp_parse_args( $allowed );
         if ( !empty($defaults) || !empty($allowed) )
             $this->query_from_env($type, $defaults, $allowed, $id);
+    }
+
+    function BB_Query_Form( $type = 'topic', $defaults = '', $allowed = '', $id = '' ) {
+        $this->__construct( $type, $defaults, $allowed, $id );
     }
 

branches/1.1/bb-includes/class.bb-walker.php

@@ -163 +163 @@
     }
 
-    function BB_Loop( &$elements ) {
+    function __construct( &$elements ) {
         $this->elements = $elements;
         if ( !is_array($this->elements) || empty($this->elements) )
             return $this->elements = false;
+    }
+
+    function BB_Loop( &$elements ) {
+        $this->__construct( $elements );
     }
 

branches/1.1/bb-includes/functions.bb-deprecated.php

@@ -890 +890 @@
 if ( !class_exists( 'WP_User' ) ) : // Deprecated in BackPress not WordPress
 class WP_User extends BP_User {
+    function __construct( $id, $name = '' ) {
+        return parent::BP_User( $id, $name );
+    }
     function WP_User( $id, $name = '' ) {
-        return parent::BP_User( $id, $name );
+        $this->__construct( $id, $name );
     }
 }

branches/1.1/xmlrpc.php

@@ -105 +105 @@
      * @return void
      */
-    function BB_XMLRPC_Server()
+    function __construct()
     {
         // bbPress publishing API
@@ -174 +174 @@
     }
 
-
+    function BB_XMLRPC_Server()
+    {
+        $this->__construct();
+    }
 
     /**