<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[17604] trunk/wp-includes: Remove PHP4 constructors.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17604">17604</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-04-05 17:25:08 +0000 (Tue, 05 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove PHP4 constructors. Props hakre. see <a href="http://trac.wordpress.org/ticket/16768">#16768</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescachephp">trunk/wp-includes/cache.php</a></li>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
<li><a href="#trunkwpincludesclasswpdependenciesphp">trunk/wp-includes/class.wp-dependencies.php</a></li>
<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescachephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/cache.php (17603 => 17604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/cache.php 2011-04-05 17:13:04 UTC (rev 17603)
+++ trunk/wp-includes/cache.php 2011-04-05 17:25:08 UTC (rev 17604)
</span><span class="lines">@@ -457,17 +457,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * PHP4 constructor; Calls PHP 5 style constructor
- *
- * @since 2.0.0
- *
- * @return WP_Object_Cache
- */
- function WP_Object_Cache() {
- return $this->__construct();
- }
-
- /**
</del><span class="cx"> * Sets up object properties; PHP 5 style constructor
</span><span class="cx"> *
</span><span class="cx"> * @since 2.0.8
</span></span></pre></div>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (17603 => 17604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2011-04-05 17:13:04 UTC (rev 17603)
+++ trunk/wp-includes/capabilities.php 2011-04-05 17:25:08 UTC (rev 17604)
</span><span class="lines">@@ -73,14 +73,11 @@
</span><span class="cx"> var $use_db = true;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * PHP4 Constructor - Call {@link WP_Roles::_init()} method.
</del><ins>+ * Constructor
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span><del>- * @access public
- *
- * @return WP_Roles
</del><span class="cx"> */
</span><del>- function WP_Roles() {
</del><ins>+ function __construct() {
</ins><span class="cx"> $this->_init();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -269,7 +266,7 @@
</span><span class="cx"> var $capabilities;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * PHP4 Constructor - Set up object properties.
</del><ins>+ * Constructor - Set up object properties.
</ins><span class="cx"> *
</span><span class="cx"> * The list of capabilities, must have the key as the name of the capability
</span><span class="cx"> * and the value a boolean of whether it is granted to the role.
</span><span class="lines">@@ -279,9 +276,8 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $role Role name.
</span><span class="cx"> * @param array $capabilities List of capabilities.
</span><del>- * @return WP_Role
</del><span class="cx"> */
</span><del>- function WP_Role( $role, $capabilities ) {
</del><ins>+ function __construct( $role, $capabilities ) {
</ins><span class="cx"> $this->name = $role;
</span><span class="cx"> $this->capabilities = $capabilities;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesclasswpdependenciesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class.wp-dependencies.php (17603 => 17604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class.wp-dependencies.php 2011-04-05 17:13:04 UTC (rev 17603)
+++ trunk/wp-includes/class.wp-dependencies.php 2011-04-05 17:25:08 UTC (rev 17604)
</span><span class="lines">@@ -25,13 +25,6 @@
</span><span class="cx"> var $groups = array();
</span><span class="cx"> var $group = 0;
</span><span class="cx">
</span><del>- function WP_Dependencies() {
- $args = func_get_args();
- call_user_func_array( array(&$this, '__construct'), $args );
- }
-
- function __construct() {}
-
</del><span class="cx"> /**
</span><span class="cx"> * Do the dependencies
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (17603 => 17604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2011-04-05 17:13:04 UTC (rev 17603)
+++ trunk/wp-includes/wp-db.php 2011-04-05 17:25:08 UTC (rev 17604)
</span><span class="lines">@@ -464,23 +464,6 @@
</span><span class="cx"> /**
</span><span class="cx"> * Connects to the database server and selects a database
</span><span class="cx"> *
</span><del>- * 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 );
- }
-
- /**
- * Connects to the database server and selects a database
- *
</del><span class="cx"> * PHP5 style constructor for compatibility with PHP5. Does
</span><span class="cx"> * the actual setting up of the class properties and connection
</span><span class="cx"> * to the database.
</span></span></pre>
</div>
</div>
</body>
</html>