Changeset 17604

Timestamp:

04/05/2011 05:25:08 PM (15 years ago)

Author:

ryan

Message:

Remove PHP4 constructors. Props hakre. see #16768

Location:

trunk/wp-includes

Files:

• cache.php (modified) (1 diff)
• capabilities.php (modified) (3 diffs)
• class.wp-dependencies.php (modified) (1 diff)
• wp-db.php (modified) (1 diff)

trunk/wp-includes/cache.php

@@ -458 +458 @@
 
         /**
-         * PHP4 constructor; Calls PHP 5 style constructor
-         *
-         * @since 2.0.0
-         *
-         * @return WP_Object_Cache
-         */
-        function WP_Object_Cache() {
-                return $this->__construct();
-        }
-
-        /**
          * Sets up object properties; PHP 5 style constructor
          *

trunk/wp-includes/capabilities.php

@@ -74 +74 @@
 
         /**
-         * PHP4 Constructor - Call {@link WP_Roles::_init()} method.
-         *
-         * @since 2.0.0
-         * @access public
-         *
-         * @return WP_Roles
-         */
-        function WP_Roles() {
+         * Constructor
+         *
+         * @since 2.0.0
+         */
+        function __construct() {
                 $this->_init();
         }
@@ -270 +267 @@
 
         /**
-         * PHP4 Constructor - Set up object properties.
+         * Constructor - Set up object properties.
          *
          * The list of capabilities, must have the key as the name of the capability
@@ -280 +277 @@
          * @param string $role Role name.
          * @param array $capabilities List of capabilities.
-         * @return WP_Role
-         */
-        function WP_Role( $role, $capabilities ) {
+         */
+        function __construct( $role, $capabilities ) {
                 $this->name = $role;
                 $this->capabilities = $capabilities;

trunk/wp-includes/class.wp-dependencies.php

@@ -25 +25 @@
         var $groups = array();
         var $group = 0;
-
-        function WP_Dependencies() {
-                $args = func_get_args();
-                call_user_func_array( array(&$this, '__construct'), $args );
-        }
-
-        function __construct() {}
 
         /**

trunk/wp-includes/wp-db.php

@@ -461 +461 @@
          */
         var $func_call;
-
-        /**
-         * Connects to the database server and selects a database
-         *
-         * PHP4 compatibility layer for calling the PHP5 constructor.
-         *
-         * @uses wpdb::__construct() Passes parameters and returns result
-         * @since 0.71
-         *
-         * @param string $dbuser MySQL database user
-         * @param string $dbpassword MySQL database password
-         * @param string $dbname MySQL database name
-         * @param string $dbhost MySQL database host
-         */
-        function wpdb( $dbuser, $dbpassword, $dbname, $dbhost ) {
-                return $this->__construct( $dbuser, $dbpassword, $dbname, $dbhost );
-        }
 
         /**