<!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>[17771] trunk: Constructor cleanup.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17771">17771</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-04-29 20:05:12 +0000 (Fri, 29 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Constructor cleanup. Props ocean90. fixes <a href="http://trac.wordpress.org/ticket/16768">#16768</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustombackgroundphp">trunk/wp-admin/custom-background.php</a></li>
<li><a href="#trunkwpadmincustomheaderphp">trunk/wp-admin/custom-header.php</a></li>
<li><a href="#trunkwpadminincludesclasswpcommentslisttablephp">trunk/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystemdirectphp">trunk/wp-admin/includes/class-wp-filesystem-direct.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystemftpextphp">trunk/wp-admin/includes/class-wp-filesystem-ftpext.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystemftpsocketsphp">trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystemssh2php">trunk/wp-admin/includes/class-wp-filesystem-ssh2.php</a></li>
<li><a href="#trunkwpadminincludesclasswpimporterphp">trunk/wp-admin/includes/class-wp-importer.php</a></li>
<li><a href="#trunkwpadminincludesclasswplinkslisttablephp">trunk/wp-admin/includes/class-wp-links-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswplisttablephp">trunk/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpmedialisttablephp">trunk/wp-admin/includes/class-wp-media-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpmssiteslisttablephp">trunk/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpmsthemeslisttablephp">trunk/wp-admin/includes/class-wp-ms-themes-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswppluginslisttablephp">trunk/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswppostslisttablephp">trunk/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswptermslisttablephp">trunk/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunkwpadminincludesclasswpuserslisttablephp">trunk/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunkwpappphp">trunk/wp-app.php</a></li>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
<li><a href="#trunkwpincludesclassfeedphp">trunk/wp-includes/class-feed.php</a></li>
<li><a href="#trunkwpincludesclasshttpphp">trunk/wp-includes/class-http.php</a></li>
<li><a href="#trunkwpincludesclasswpajaxresponsephp">trunk/wp-includes/class-wp-ajax-response.php</a></li>
<li><a href="#trunkwpincludesclasswperrorphp">trunk/wp-includes/class-wp-error.php</a></li>
<li><a href="#trunkwpincludesclasswphttpixrclientphp">trunk/wp-includes/class-wp-http-ixr-client.php</a></li>
<li><a href="#trunkwpincludesclasswpxmlrpcserverphp">trunk/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunkwpincludesclasswpphp">trunk/wp-includes/class-wp.php</a></li>
<li><a href="#trunkwpincludesclasswpdependenciesphp">trunk/wp-includes/class.wp-dependencies.php</a></li>
<li><a href="#trunkwpincludeslocalephp">trunk/wp-includes/locale.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludesrewritephp">trunk/wp-includes/rewrite.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
<li><a href="#trunkwpincludeswpdiffphp">trunk/wp-includes/wp-diff.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincustombackgroundphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-background.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-background.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-admin/custom-background.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -43,14 +43,14 @@
</span><span class="cx"> var $page = '';
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * PHP4 Constructor - Register administration header callback.
</del><ins>+ * Constructor - Register administration header callback.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> * @param callback $admin_header_callback
</span><span class="cx"> * @param callback $admin_image_div_callback Optional custom image div output callback.
</span><span class="cx"> * @return Custom_Background
</span><span class="cx"> */
</span><del>- function Custom_Background($admin_header_callback = '', $admin_image_div_callback = '') {
</del><ins>+ function __construct($admin_header_callback = '', $admin_image_div_callback = '') {
</ins><span class="cx"> $this->admin_header_callback = $admin_header_callback;
</span><span class="cx"> $this->admin_image_div_callback = $admin_image_div_callback;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-header.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-admin/custom-header.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -62,14 +62,14 @@
</span><span class="cx"> var $page = '';
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * PHP4 Constructor - Register administration header callback.
</del><ins>+ * Constructor - Register administration header callback.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.1.0
</span><span class="cx"> * @param callback $admin_header_callback
</span><span class="cx"> * @param callback $admin_image_div_callback Optional custom image div output callback.
</span><span class="cx"> * @return Custom_Image_Header
</span><span class="cx"> */
</span><del>- function Custom_Image_Header($admin_header_callback, $admin_image_div_callback = '') {
</del><ins>+ function __construct($admin_header_callback, $admin_image_div_callback = '') {
</ins><span class="cx"> $this->admin_header_callback = $admin_header_callback;
</span><span class="cx"> $this->admin_image_div_callback = $admin_image_div_callback;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpcommentslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-comments-list-table.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-comments-list-table.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-admin/includes/class-wp-comments-list-table.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx">
</span><span class="cx"> var $pending_count = array();
</span><span class="cx">
</span><del>- function WP_Comments_List_Table() {
</del><ins>+ function __construct() {
</ins><span class="cx"> global $post_id;
</span><span class="cx">
</span><span class="cx"> $post_id = isset( $_REQUEST['p'] ) ? absint( $_REQUEST['p'] ) : 0;
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> if ( get_option('show_avatars') )
</span><span class="cx"> add_filter( 'comment_author', 'floated_admin_avatar' );
</span><span class="cx">
</span><del>- parent::WP_List_Table( array(
</del><ins>+ parent::__construct( array(
</ins><span class="cx"> 'plural' => 'comments',
</span><span class="cx"> 'singular' => 'comment',
</span><span class="cx"> 'ajax' => true,
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystemdirectphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-direct.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-direct.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-admin/includes/class-wp-filesystem-direct.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param mixed $arg ingored argument
</span><span class="cx"> */
</span><del>- function WP_Filesystem_Direct($arg) {
</del><ins>+ function __construct($arg) {
</ins><span class="cx"> $this->method = 'direct';
</span><span class="cx"> $this->errors = new WP_Error();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystemftpextphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-ftpext.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-ftpext.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-admin/includes/class-wp-filesystem-ftpext.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> var $errors = null;
</span><span class="cx"> var $options = array();
</span><span class="cx">
</span><del>- function WP_Filesystem_FTPext($opt='') {
</del><ins>+ function __construct($opt='') {
</ins><span class="cx"> $this->method = 'ftpext';
</span><span class="cx"> $this->errors = new WP_Error();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystemftpsocketsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> var $errors = null;
</span><span class="cx"> var $options = array();
</span><span class="cx">
</span><del>- function WP_Filesystem_ftpsockets($opt = '') {
</del><ins>+ function __construct($opt = '') {
</ins><span class="cx"> $this->method = 'ftpsockets';
</span><span class="cx"> $this->errors = new WP_Error();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystemssh2php"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-ssh2.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-ssh2.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-admin/includes/class-wp-filesystem-ssh2.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> var $errors = array();
</span><span class="cx"> var $options = array();
</span><span class="cx">
</span><del>- function WP_Filesystem_SSH2($opt='') {
</del><ins>+ function __construct($opt='') {
</ins><span class="cx"> $this->method = 'ssh2';
</span><span class="cx"> $this->errors = new WP_Error();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpimporterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-importer.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-importer.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-admin/includes/class-wp-importer.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -10,10 +10,6 @@
</span><span class="cx"> */
</span><span class="cx"> function __construct() {}
</span><span class="cx">
</span><del>- function WP_Importer() {
- $this->__construct();
- }
-
</del><span class="cx"> /**
</span><span class="cx"> * Returns array with imported permalinks from WordPress database
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpadminincludesclasswplinkslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-links-list-table.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-links-list-table.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-admin/includes/class-wp-links-list-table.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -9,8 +9,8 @@
</span><span class="cx"> */
</span><span class="cx"> class WP_Links_List_Table extends WP_List_Table {
</span><span class="cx">
</span><del>- function WP_Links_List_Table() {
- parent::WP_List_Table( array(
</del><ins>+ function __construct() {
+ parent::__construct( array(
</ins><span class="cx"> 'plural' => 'bookmarks',
</span><span class="cx"> ) );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-list-table.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-list-table.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-admin/includes/class-wp-list-table.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> * @param array $args An associative array with information about the current table
</span><span class="cx"> * @access protected
</span><span class="cx"> */
</span><del>- function WP_List_Table( $args = array() ) {
</del><ins>+ function __construct( $args = array() ) {
</ins><span class="cx"> $args = wp_parse_args( $args, array(
</span><span class="cx"> 'plural' => '',
</span><span class="cx"> 'singular' => '',
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpmedialisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-media-list-table.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-media-list-table.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-admin/includes/class-wp-media-list-table.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -9,10 +9,10 @@
</span><span class="cx"> */
</span><span class="cx"> class WP_Media_List_Table extends WP_List_Table {
</span><span class="cx">
</span><del>- function WP_Media_List_Table() {
</del><ins>+ function __construct() {
</ins><span class="cx"> $this->detached = isset( $_REQUEST['detached'] ) || isset( $_REQUEST['find_detached'] );
</span><span class="cx">
</span><del>- parent::WP_List_Table( array(
</del><ins>+ parent::__construct( array(
</ins><span class="cx"> 'plural' => 'media'
</span><span class="cx"> ) );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpmssiteslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-sites-list-table.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-sites-list-table.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-admin/includes/class-wp-ms-sites-list-table.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -9,8 +9,8 @@
</span><span class="cx"> */
</span><span class="cx"> class WP_MS_Sites_List_Table extends WP_List_Table {
</span><span class="cx">
</span><del>- function WP_MS_Sites_List_Table() {
- parent::WP_List_Table( array(
</del><ins>+ function __construct() {
+ parent::__construct( array(
</ins><span class="cx"> 'plural' => 'sites',
</span><span class="cx"> ) );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpmsthemeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-themes-list-table.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-themes-list-table.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-admin/includes/class-wp-ms-themes-list-table.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> var $site_id;
</span><span class="cx"> var $is_site_themes;
</span><span class="cx">
</span><del>- function WP_MS_Themes_List_Table() {
</del><ins>+ function __construct() {
</ins><span class="cx"> global $status, $page;
</span><span class="cx">
</span><span class="cx"> $default_status = get_user_option( 'themes_last_view' );
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> if ( $this->is_site_themes )
</span><span class="cx"> $this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
</span><span class="cx">
</span><del>- parent::WP_List_Table( array(
</del><ins>+ parent::__construct( array(
</ins><span class="cx"> 'plural' => 'themes'
</span><span class="cx"> ) );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesclasswppluginslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-plugins-list-table.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-plugins-list-table.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-admin/includes/class-wp-plugins-list-table.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> */
</span><span class="cx"> class WP_Plugins_List_Table extends WP_List_Table {
</span><span class="cx">
</span><del>- function WP_Plugins_List_Table() {
</del><ins>+ function __construct() {
</ins><span class="cx"> global $status, $page;
</span><span class="cx">
</span><span class="cx"> $default_status = get_user_option( 'plugins_last_view' );
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">
</span><span class="cx"> $page = $this->get_pagenum();
</span><span class="cx">
</span><del>- parent::WP_List_Table( array(
</del><ins>+ parent::__construct( array(
</ins><span class="cx"> 'plural' => 'plugins',
</span><span class="cx"> ) );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-posts-list-table.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-posts-list-table.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-admin/includes/class-wp-posts-list-table.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> */
</span><span class="cx"> var $sticky_posts_count = 0;
</span><span class="cx">
</span><del>- function WP_Posts_List_Table() {
</del><ins>+ function __construct() {
</ins><span class="cx"> global $post_type_object, $post_type, $wpdb;
</span><span class="cx">
</span><span class="cx"> if ( !isset( $_REQUEST['post_type'] ) )
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> $this->sticky_posts_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( 1 ) FROM $wpdb->posts WHERE post_type = %s AND post_status != 'trash' AND ID IN ($sticky_posts)", $post_type ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- parent::WP_List_Table( array(
</del><ins>+ parent::__construct( array(
</ins><span class="cx"> 'plural' => 'posts',
</span><span class="cx"> ) );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesclasswptermslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-terms-list-table.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-terms-list-table.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-admin/includes/class-wp-terms-list-table.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx">
</span><span class="cx"> var $callback_args;
</span><span class="cx">
</span><del>- function WP_Terms_List_Table() {
</del><ins>+ function __construct() {
</ins><span class="cx"> global $post_type, $taxonomy, $tax;
</span><span class="cx">
</span><span class="cx"> wp_reset_vars( array( 'action', 'taxonomy', 'post_type' ) );
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> if ( empty( $post_type ) || !in_array( $post_type, get_post_types( array( 'public' => true ) ) ) )
</span><span class="cx"> $post_type = 'post';
</span><span class="cx">
</span><del>- parent::WP_List_Table( array(
</del><ins>+ parent::__construct( array(
</ins><span class="cx"> 'plural' => 'tags',
</span><span class="cx"> 'singular' => 'tag',
</span><span class="cx"> ) );
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-admin/includes/class-wp-upgrader.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -25,9 +25,6 @@
</span><span class="cx"> var $skin = null;
</span><span class="cx"> var $result = array();
</span><span class="cx">
</span><del>- function WP_Upgrader($skin = null) {
- return $this->__construct($skin);
- }
</del><span class="cx"> function __construct($skin = null) {
</span><span class="cx"> if ( null == $skin )
</span><span class="cx"> $this->skin = new WP_Upgrader_Skin();
</span><span class="lines">@@ -925,9 +922,6 @@
</span><span class="cx"> var $done_header = false;
</span><span class="cx"> var $result = false;
</span><span class="cx">
</span><del>- function WP_Upgrader_Skin($args = array()) {
- return $this->__construct($args);
- }
</del><span class="cx"> function __construct($args = array()) {
</span><span class="cx"> $defaults = array( 'url' => '', 'nonce' => '', 'title' => '', 'context' => false );
</span><span class="cx"> $this->options = wp_parse_args($args, $defaults);
</span><span class="lines">@@ -1014,10 +1008,6 @@
</span><span class="cx"> var $plugin_active = false;
</span><span class="cx"> var $plugin_network_active = false;
</span><span class="cx">
</span><del>- function Plugin_Upgrader_Skin($args = array()) {
- return $this->__construct($args);
- }
-
</del><span class="cx"> function __construct($args = array()) {
</span><span class="cx"> $defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Update Plugin') );
</span><span class="cx"> $args = wp_parse_args($args, $defaults);
</span><span class="lines">@@ -1070,10 +1060,6 @@
</span><span class="cx"> var $in_loop = false;
</span><span class="cx"> var $error = false;
</span><span class="cx">
</span><del>- function Bulk_Upgrader_Skin($args = array()) {
- return $this->__construct($args);
- }
-
</del><span class="cx"> function __construct($args = array()) {
</span><span class="cx"> $defaults = array( 'url' => '', 'nonce' => '' );
</span><span class="cx"> $args = wp_parse_args($args, $defaults);
</span><span class="lines">@@ -1178,7 +1164,8 @@
</span><span class="cx">
</span><span class="cx"> class Bulk_Plugin_Upgrader_Skin extends Bulk_Upgrader_Skin {
</span><span class="cx"> var $plugin_info = array(); // Plugin_Upgrader::bulk() will fill this in.
</span><del>- function Plugin_Upgrader_Skin($args = array()) {
</del><ins>+
+ function __construct($args = array()) {
</ins><span class="cx"> parent::__construct($args);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1209,7 +1196,8 @@
</span><span class="cx">
</span><span class="cx"> class Bulk_Theme_Upgrader_Skin extends Bulk_Upgrader_Skin {
</span><span class="cx"> var $theme_info = array(); // Theme_Upgrader::bulk() will fill this in.
</span><del>- function Theme_Upgrader_Skin($args = array()) {
</del><ins>+
+ function __construct($args = array()) {
</ins><span class="cx"> parent::__construct($args);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1251,10 +1239,6 @@
</span><span class="cx"> var $api;
</span><span class="cx"> var $type;
</span><span class="cx">
</span><del>- function Plugin_Installer_Skin($args = array()) {
- return $this->__construct($args);
- }
-
</del><span class="cx"> function __construct($args = array()) {
</span><span class="cx"> $defaults = array( 'type' => 'web', 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => '' );
</span><span class="cx"> $args = wp_parse_args($args, $defaults);
</span><span class="lines">@@ -1319,10 +1303,6 @@
</span><span class="cx"> var $api;
</span><span class="cx"> var $type;
</span><span class="cx">
</span><del>- function Theme_Installer_Skin($args = array()) {
- return $this->__construct($args);
- }
-
</del><span class="cx"> function __construct($args = array()) {
</span><span class="cx"> $defaults = array( 'type' => 'web', 'url' => '', 'theme' => '', 'nonce' => '', 'title' => '' );
</span><span class="cx"> $args = wp_parse_args($args, $defaults);
</span><span class="lines">@@ -1385,10 +1365,6 @@
</span><span class="cx"> class Theme_Upgrader_Skin extends WP_Upgrader_Skin {
</span><span class="cx"> var $theme = '';
</span><span class="cx">
</span><del>- function Theme_Upgrader_Skin($args = array()) {
- return $this->__construct($args);
- }
-
</del><span class="cx"> function __construct($args = array()) {
</span><span class="cx"> $defaults = array( 'url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Update Theme') );
</span><span class="cx"> $args = wp_parse_args($args, $defaults);
</span><span class="lines">@@ -1440,9 +1416,6 @@
</span><span class="cx"> var $package;
</span><span class="cx"> var $filename;
</span><span class="cx">
</span><del>- function File_Upload_Upgrader($form, $urlholder) {
- return $this->__construct($form, $urlholder);
- }
</del><span class="cx"> function __construct($form, $urlholder) {
</span><span class="cx"> if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
</span><span class="cx"> wp_die($uploads['error']);
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpuserslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-users-list-table.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-users-list-table.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-admin/includes/class-wp-users-list-table.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -12,14 +12,14 @@
</span><span class="cx"> var $site_id;
</span><span class="cx"> var $is_site_users;
</span><span class="cx">
</span><del>- function WP_Users_List_Table() {
</del><ins>+ function __construct() {
</ins><span class="cx"> $screen = get_current_screen();
</span><span class="cx"> $this->is_site_users = 'site-users-network' == $screen->id;
</span><span class="cx">
</span><span class="cx"> if ( $this->is_site_users )
</span><span class="cx"> $this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
</span><span class="cx">
</span><del>- parent::WP_List_Table( array(
</del><ins>+ parent::__construct( array(
</ins><span class="cx"> 'singular' => 'user',
</span><span class="cx"> 'plural' => 'users'
</span><span class="cx"> ) );
</span></span></pre></div>
<a id="trunkwpappphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-app.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-app.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-app.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -216,12 +216,12 @@
</span><span class="cx"> var $do_output = true;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * PHP4 constructor - Sets up object properties.
</del><ins>+ * Constructor - Sets up object properties.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.2.0
</span><span class="cx"> * @return AtomServer
</span><span class="cx"> */
</span><del>- function AtomServer() {
</del><ins>+ function __construct() {
</ins><span class="cx">
</span><span class="cx"> $this->script_name = array_pop( $var_by_ref = explode( '/', $_SERVER['SCRIPT_NAME'] ) );
</span><span class="cx"> $this->app_base = site_url( $this->script_name . '/' );
</span></span></pre></div>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-includes/capabilities.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -456,7 +456,7 @@
</span><span class="cx"> var $filter = null;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * PHP4 Constructor - Sets up the object properties.
</del><ins>+ * Constructor - Sets up the object properties.
</ins><span class="cx"> *
</span><span class="cx"> * Retrieves the userdata and then assigns all of the data keys to direct
</span><span class="cx"> * properties of the object. Calls {@link WP_User::_init_caps()} after
</span><span class="lines">@@ -470,7 +470,7 @@
</span><span class="cx"> * @param int $blog_id Optional Blog ID, defaults to current blog.
</span><span class="cx"> * @return WP_User
</span><span class="cx"> */
</span><del>- function WP_User( $id, $name = '', $blog_id = '' ) {
</del><ins>+ function __construct( $id, $name = '', $blog_id = '' ) {
</ins><span class="cx">
</span><span class="cx"> if ( empty( $id ) && empty( $name ) )
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkwpincludesclassfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-feed.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-feed.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-includes/class-feed.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -5,15 +5,6 @@
</span><span class="cx">
</span><span class="cx"> class WP_Feed_Cache extends SimplePie_Cache {
</span><span class="cx"> /**
</span><del>- * Don't call the constructor. Please.
- *
- * @access private
- */
- function WP_Feed_Cache() {
- trigger_error('Please call SimplePie_Cache::create() instead of the constructor', E_USER_ERROR);
- }
-
- /**
</del><span class="cx"> * Create a new SimplePie_Cache object
</span><span class="cx"> *
</span><span class="cx"> * @static
</span><span class="lines">@@ -29,7 +20,7 @@
</span><span class="cx"> var $mod_name;
</span><span class="cx"> var $lifetime = 43200; //Default lifetime in cache of 12 hours
</span><span class="cx">
</span><del>- function WP_Feed_Cache_Transient($location, $filename, $extension) {
</del><ins>+ function __construct($location, $filename, $extension) {
</ins><span class="cx"> $this->name = 'feed_' . $filename;
</span><span class="cx"> $this->mod_name = 'feed_mod_' . $filename;
</span><span class="cx"> $this->lifetime = apply_filters('wp_feed_cache_transient_lifetime', $this->lifetime, $filename);
</span><span class="lines">@@ -65,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> class WP_SimplePie_File extends SimplePie_File {
</span><span class="cx">
</span><del>- function WP_SimplePie_File($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) {
</del><ins>+ function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) {
</ins><span class="cx"> $this->url = $url;
</span><span class="cx"> $this->timeout = $timeout;
</span><span class="cx"> $this->redirects = $redirects;
</span></span></pre></div>
<a id="trunkwpincludesclasshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-http.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-http.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-includes/class-http.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -1409,17 +1409,6 @@
</span><span class="cx"> var $domain;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * PHP4 style Constructor - Calls PHP5 Style Constructor.
- *
- * @access public
- * @since 2.8.0
- * @param string|array $data Raw cookie data.
- */
- function WP_Http_Cookie( $data ) {
- $this->__construct( $data );
- }
-
- /**
</del><span class="cx"> * Sets up this cookie object.
</span><span class="cx"> *
</span><span class="cx"> * The parameter $data should be either an associative array containing the indices names below
</span></span></pre></div>
<a id="trunkwpincludesclasswpajaxresponsephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-ajax-response.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-ajax-response.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-includes/class-wp-ajax-response.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> var $responses = array();
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * PHP4 Constructor - Passes args to {@link WP_Ajax_Response::add()}.
</del><ins>+ * Constructor - Passes args to {@link WP_Ajax_Response::add()}.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.1.0
</span><span class="cx"> * @see WP_Ajax_Response::add()
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> * @param string|array $args Optional. Will be passed to add() method.
</span><span class="cx"> * @return WP_Ajax_Response
</span><span class="cx"> */
</span><del>- function WP_Ajax_Response( $args = '' ) {
</del><ins>+ function __construct( $args = '' ) {
</ins><span class="cx"> if ( !empty($args) )
</span><span class="cx"> $this->add($args);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesclasswperrorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-error.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-error.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-includes/class-wp-error.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> var $error_data = array();
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * PHP4 Constructor - Sets up error message.
</del><ins>+ * Constructor - Sets up error message.
</ins><span class="cx"> *
</span><span class="cx"> * If code parameter is empty then nothing will be done. It is possible to
</span><span class="cx"> * add multiple messages to the same code, but with other methods in the
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> * @param mixed $data Optional. Error data.
</span><span class="cx"> * @return WP_Error
</span><span class="cx"> */
</span><del>- function WP_Error($code = '', $message = '', $data = '') {
</del><ins>+ function __construct($code = '', $message = '', $data = '') {
</ins><span class="cx"> if ( empty($code) )
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesclasswphttpixrclientphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-http-ixr-client.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-http-ixr-client.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-includes/class-wp-http-ixr-client.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -7,7 +7,8 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx"> class WP_HTTP_IXR_Client extends IXR_Client {
</span><del>- function WP_HTTP_IXR_Client($server, $path = false, $port = 80, $timeout = 15) {
</del><ins>+
+ function __construct($server, $path = false, $port = 80, $timeout = 15) {
</ins><span class="cx"> if ( ! $path ) {
</span><span class="cx"> // Assume we have been given a URL instead
</span><span class="cx"> $bits = parse_url($server);
</span></span></pre></div>
<a id="trunkwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-xmlrpc-server.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-xmlrpc-server.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-includes/class-wp-xmlrpc-server.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Register all of the XMLRPC methods that XMLRPC server understands.
</span><span class="cx"> *
</span><del>- * PHP4 constructor and sets up server and method property. Passes XMLRPC
</del><ins>+ * Sets up server and method property. Passes XMLRPC
</ins><span class="cx"> * methods through the 'xmlrpc_methods' filter to allow plugins to extend
</span><span class="cx"> * or replace XMLRPC methods.
</span><span class="cx"> *
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @return wp_xmlrpc_server
</span><span class="cx"> */
</span><del>- function wp_xmlrpc_server() {
</del><ins>+ function __construct() {
</ins><span class="cx"> $this->methods = array(
</span><span class="cx"> // WordPress API
</span><span class="cx"> 'wp.getUsersBlogs' => 'this:wp_getUsersBlogs',
</span></span></pre></div>
<a id="trunkwpincludesclasswpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-includes/class-wp.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -504,18 +504,6 @@
</span><span class="cx"> do_action_ref_array('wp', array(&$this));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /**
- * PHP4 Constructor - Does nothing.
- *
- * Call main() method when ready to run setup.
- *
- * @since 2.0.0
- *
- * @return WP
- */
- function WP() {
- // Empty.
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesclasswpdependenciesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class.wp-dependencies.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class.wp-dependencies.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-includes/class.wp-dependencies.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx">
</span><span class="cx"> var $extra = array();
</span><span class="cx">
</span><del>- function _WP_Dependency() {
</del><ins>+ function __construct() {
</ins><span class="cx"> @list($this->handle, $this->src, $this->deps, $this->ver, $this->args) = func_get_args();
</span><span class="cx"> if ( !is_array($this->deps) )
</span><span class="cx"> $this->deps = array();
</span></span></pre></div>
<a id="trunkwpincludeslocalephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/locale.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/locale.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-includes/locale.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * PHP4 style constructor which calls helper methods to set up object variables
</del><ins>+ * Constructor which calls helper methods to set up object variables
</ins><span class="cx"> *
</span><span class="cx"> * @uses WP_Locale::init()
</span><span class="cx"> * @uses WP_Locale::register_globals()
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @return WP_Locale
</span><span class="cx"> */
</span><del>- function WP_Locale() {
</del><ins>+ function __construct() {
</ins><span class="cx"> $this->init();
</span><span class="cx"> $this->register_globals();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-includes/query.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -2970,7 +2970,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * PHP4 type constructor.
</del><ins>+ * Constructor.
</ins><span class="cx"> *
</span><span class="cx"> * Sets up the WordPress query, if parameter is not empty.
</span><span class="cx"> *
</span><span class="lines">@@ -2980,7 +2980,7 @@
</span><span class="cx"> * @param string $query URL query string.
</span><span class="cx"> * @return WP_Query
</span><span class="cx"> */
</span><del>- function WP_Query($query = '') {
</del><ins>+ function __construct($query = '') {
</ins><span class="cx"> if ( ! empty($query) ) {
</span><span class="cx"> $this->query($query);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesrewritephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rewrite.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rewrite.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-includes/rewrite.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -1976,14 +1976,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * PHP4 Constructor - Calls init(), which runs setup.
</del><ins>+ * Constructor - Calls init(), which runs setup.
</ins><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> * @access public
</span><span class="cx"> *
</span><span class="cx"> * @return WP_Rewrite
</span><span class="cx"> */
</span><del>- function WP_Rewrite() {
</del><ins>+ function __construct() {
</ins><span class="cx"> $this->init();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-includes/user.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -361,12 +361,6 @@
</span><span class="cx"> var $query_orderby;
</span><span class="cx"> var $query_limit;
</span><span class="cx">
</span><del>- /**
- * PHP4 constructor
- */
- function WP_User_Query( $query = null ) {
- $this->__construct( $query );
- }
</del><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * PHP5 constructor
</span></span></pre></div>
<a id="trunkwpincludeswpdiffphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-diff.php (17770 => 17771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-diff.php 2011-04-29 19:45:30 UTC (rev 17770)
+++ trunk/wp-includes/wp-diff.php 2011-04-29 20:05:12 UTC (rev 17771)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> var $inline_diff_renderer = 'WP_Text_Diff_Renderer_inline';
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * PHP4 Constructor - Call parent constructor with params array.
</del><ins>+ * Constructor - Call parent constructor with params array.
</ins><span class="cx"> *
</span><span class="cx"> * This will set class properties based on the key value pairs in the array.
</span><span class="cx"> *
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param array $params
</span><span class="cx"> */
</span><del>- function Text_Diff_Renderer_Table( $params = array() ) {
</del><ins>+ function __construct( $params = array() ) {
</ins><span class="cx"> $parent = get_parent_class($this);
</span><span class="cx"> $this->$parent( $params );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>