<!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" />
<title>[31188] trunk/src: In PHP 5.0.0, `is_a()` became deprecated in favour of the `instanceof` operator.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/31188">31188</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31188","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-01-16 01:05:52 +0000 (Fri, 16 Jan 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>In PHP 5.0.0, `is_a()` became deprecated in favour of the `instanceof` operator. Calling `is_a()` would result in an `E_STRICT` warning.
In PHP 5.3.0, `is_a()` is no longer deprecated, and will therefore no longer throw `E_STRICT` warnings.
To avoid warnings in PHP < 5.3.0, convert all `is_a()` calls to `$var instanceof WP_Class` calls.
`instanceof` does not throw any error if the variable being tested is not an object, it simply returns `false`.
Props markoheijnen, wonderboymusic.
Fixes <a href="https://core.trac.wordpress.org/ticket/25672">#25672</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpuserslisttablephp">trunk/src/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesscreenphp">trunk/src/wp-admin/includes/screen.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>
<li><a href="#trunksrcwpincludescapabilitiesphp">trunk/src/wp-includes/capabilities.php</a></li>
<li><a href="#trunksrcwpincludescategorytemplatephp">trunk/src/wp-includes/category-template.php</a></li>
<li><a href="#trunksrcwpincludesclassfeedphp">trunk/src/wp-includes/class-feed.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunksrcwpincludesclasswperrorphp">trunk/src/wp-includes/class-wp-error.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemephp">trunk/src/wp-includes/class-wp-theme.php</a></li>
<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunksrcwpincludescompatphp">trunk/src/wp-includes/compat.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>
<li><a href="#trunksrcwpincludesfunctionswpscriptsphp">trunk/src/wp-includes/functions.wp-scripts.php</a></li>
<li><a href="#trunksrcwpincludesfunctionswpstylesphp">trunk/src/wp-includes/functions.wp-styles.php</a></li>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunksrcwpincludestemplatephp">trunk/src/wp-includes/template.php</a></li>
<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsphp">trunk/src/wp-includes/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpuserslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-users-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-users-list-table.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-admin/includes/class-wp-users-list-table.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -339,8 +339,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function single_row( $user_object, $style = '', $role = '', $numposts = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_roles;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !( is_object( $user_object ) && is_a( $user_object, 'WP_User' ) ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $user_object instanceof WP_User ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_object = get_userdata( (int) $user_object );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_object->filter = 'display';
</span><span class="cx" style="display: block; padding: 0 10px"> $email = $user_object->user_email;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesscreenphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/screen.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/screen.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-admin/includes/screen.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -374,8 +374,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get( $hook_name = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_a( $hook_name, 'WP_Screen' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $hook_name instanceof WP_Screen ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $hook_name;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = $taxonomy = null;
</span><span class="cx" style="display: block; padding: 0 10px"> $in_admin = false;
</span></span></pre></div>
<a id="trunksrcwpadminincludestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-admin/includes/template.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,7 +176,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_parse_args( $params, $defaults );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $r['walker'] ) || ! is_a( $r['walker'], 'Walker' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $r['walker'] ) || ! ( $r['walker'] instanceof Walker ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $walker = new Walker_Category_Checklist;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $walker = $r['walker'];
</span></span></pre></div>
<a id="trunksrcwpadminincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-admin/includes/theme.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,8 +149,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !isset($themes_update) )
</span><span class="cx" style="display: block; padding: 0 10px"> $themes_update = get_site_transient('update_themes');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_a( $theme, 'WP_Theme' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $theme instanceof WP_Theme ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $stylesheet = $theme->get_stylesheet();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludescapabilitiesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/capabilities.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/capabilities.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-includes/capabilities.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -520,7 +520,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_a( $id, 'WP_User' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $id instanceof WP_User ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->init( $id->data, $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_object( $id ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludescategorytemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/category-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/category-template.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-includes/category-template.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -882,11 +882,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function walk_category_tree() {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = func_get_args();
</span><span class="cx" style="display: block; padding: 0 10px"> // the user's options are the third parameter
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty($args[2]['walker']) || !is_a($args[2]['walker'], 'Walker') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $args[2]['walker'] ) || ! ( $args[2]['walker'] instanceof Walker ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $walker = new Walker_Category;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $walker = $args[2]['walker'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> return call_user_func_array(array( &$walker, 'walk' ), $args );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesclassfeedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-feed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-feed.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-includes/class-feed.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,8 +37,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function save($data) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_a($data, 'SimplePie') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $data instanceof SimplePie ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = $data->data;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> set_transient($this->name, $data, $this->lifetime);
</span><span class="cx" style="display: block; padding: 0 10px"> set_transient($this->mod_name, time(), $this->lifetime);
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -695,11 +695,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function add_setting( $id, $args = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_a( $id, 'WP_Customize_Setting' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $id instanceof WP_Customize_Setting ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $setting = $id;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $setting = new WP_Customize_Setting( $this, $id, $args );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->settings[ $setting->id ] = $setting;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -737,10 +737,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Optional. Panel arguments. Default empty array.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function add_panel( $id, $args = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_a( $id, 'WP_Customize_Panel' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $id instanceof WP_Customize_Panel ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $panel = $id;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
- else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $panel = new WP_Customize_Panel( $this, $id, $args );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -783,11 +782,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Section arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function add_section( $id, $args = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_a( $id, 'WP_Customize_Section' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $id instanceof WP_Customize_Section ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $section = $id;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $section = new WP_Customize_Section( $this, $id, $args );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->sections[ $section->id ] = $section;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -825,11 +824,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function add_control( $id, $args = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_a( $id, 'WP_Customize_Control' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $id instanceof WP_Customize_Control ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $control = $id;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $control = new WP_Customize_Control( $this, $id, $args );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->controls[ $control->id ] = $control;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswperrorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-error.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-error.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-includes/class-wp-error.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,8 +214,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $thing Check if unknown variable is a WP_Error object.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True, if WP_Error. False, if not WP_Error.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function is_wp_error($thing) {
- if ( is_object($thing) && is_a($thing, 'WP_Error') )
- return true;
- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function is_wp_error( $thing ) {
+ return ( $thing instanceof WP_Error );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-includes/class-wp-theme.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,7 +274,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the parent, if we're a child theme.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->template != $this->stylesheet ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If we are a parent, then there is a problem. Only two generations allowed! Cancel things out.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_a( $_child, 'WP_Theme' ) && $_child->template == $this->stylesheet ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $_child instanceof WP_Theme && $_child->template == $this->stylesheet ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_child->parent = null;
</span><span class="cx" style="display: block; padding: 0 10px"> $_child->errors = new WP_Error( 'theme_parent_invalid', sprintf( __( 'The "%s" theme is not a valid parent theme.' ), $_child->template ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $_child->cache_add( 'theme', array( 'headers' => $_child->headers, 'errors' => $_child->errors, 'stylesheet' => $_child->stylesheet, 'template' => $_child->template ) );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-xmlrpc-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-xmlrpc-server.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1117,13 +1117,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->error;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // convert the date field back to IXR form
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $content_struct['post_date'] ) && ! is_a( $content_struct['post_date'], 'IXR_Date' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $content_struct['post_date'] ) && ! ( $content_struct['post_date'] instanceof IXR_Date ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $content_struct['post_date'] = $this->_convert_date( $content_struct['post_date'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // ignore the existing GMT date if it is empty or a non-GMT date was supplied in $content_struct,
</span><span class="cx" style="display: block; padding: 0 10px"> // since _insert_post will ignore the non-GMT date if the GMT date is set
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $content_struct['post_date_gmt'] ) && ! is_a( $content_struct['post_date_gmt'], 'IXR_Date' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $content_struct['post_date_gmt'] ) && ! ( $content_struct['post_date_gmt'] instanceof IXR_Date ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $content_struct['post_date_gmt'] == '0000-00-00 00:00:00' || isset( $content_struct['post_date'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $content_struct['post_date_gmt'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpincludescompatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/compat.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-includes/compat.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function json_encode( $string ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_json;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !is_a($wp_json, 'Services_JSON') ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $wp_json instanceof Services_JSON ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . WPINC . '/class-json.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_json = new Services_JSON();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,7 +78,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function json_decode( $string, $assoc_array = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_json;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !is_a($wp_json, 'Services_JSON') ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ($wp_json instanceof Services_JSON ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . WPINC . '/class-json.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_json = new Services_JSON();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesdeprecatedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-includes/deprecated.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2684,7 +2684,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_object($user) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !isset($user->ID) )
</span><span class="cx" style="display: block; padding: 0 10px"> $user->ID = 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !is_a( $user, 'WP_User' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $user instanceof WP_User ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $vars = get_object_vars($user);
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_keys($vars) as $field ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_string($user->$field) || is_numeric($user->$field) )
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionswpscriptsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.wp-scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.wp-scripts.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-includes/functions.wp-scripts.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,7 +35,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $handles = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_scripts;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! did_action( 'init' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>login_enqueue_scripts</code>' ), '3.3' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_footer = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_scripts;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! did_action( 'init' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>login_enqueue_scripts</code>' ), '3.3' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +115,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_localize_script( $handle, $object_name, $l10n ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_scripts;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! did_action( 'init' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>login_enqueue_scripts</code>' ), '3.3' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,7 +141,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_deregister_script( $handle ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_scripts;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! did_action( 'init' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>login_enqueue_scripts</code>' ), '3.3' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +197,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_enqueue_script( $handle, $src = false, $deps = array(), $ver = false, $in_footer = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_scripts;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! did_action( 'init' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>login_enqueue_scripts</code>' ), '3.3' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -229,7 +229,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_dequeue_script( $handle ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_scripts;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! did_action( 'init' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>login_enqueue_scripts</code>' ), '3.3' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,7 +254,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_script_is( $handle, $list = 'enqueued' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_scripts;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! did_action( 'init' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>login_enqueue_scripts</code>' ), '3.3' );
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionswpstylesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.wp-styles.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.wp-styles.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-includes/functions.wp-styles.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'wp_print_styles' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_styles;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $wp_styles instanceof WP_Styles ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! did_action( 'init' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>login_enqueue_scripts</code>' ), '3.3' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_add_inline_style( $handle, $data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_styles;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $wp_styles instanceof WP_Styles ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! did_action( 'init' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>login_enqueue_scripts</code>' ), '3.3' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,7 +102,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_register_style( $handle, $src, $deps = array(), $ver = false, $media = 'all' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_styles;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $wp_styles instanceof WP_Styles ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! did_action( 'init' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>login_enqueue_scripts</code>' ), '3.3' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +124,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_deregister_style( $handle ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_styles;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $wp_styles instanceof WP_Styles ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! did_action( 'init' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>login_enqueue_scripts</code>' ), '3.3' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +157,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_enqueue_style( $handle, $src = false, $deps = array(), $ver = false, $media = 'all' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_styles;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $wp_styles instanceof WP_Styles ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! did_action( 'init' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>login_enqueue_scripts</code>' ), '3.3' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,7 +183,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_dequeue_style( $handle ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_styles;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $wp_styles instanceof WP_Styles ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! did_action( 'init' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>login_enqueue_scripts</code>' ), '3.3' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,7 +207,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_style_is( $handle, $list = 'enqueued' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_styles;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $wp_styles instanceof WP_Styles ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! did_action( 'init' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>login_enqueue_scripts</code>' ), '3.3' );
</span></span></pre></div>
<a id="trunksrcwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/general-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/general-template.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-includes/general-template.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2849,8 +2849,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_admin_css( $file = 'wp-admin', $force_echo = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_styles;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !is_a($wp_styles, 'WP_Styles') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $wp_styles instanceof WP_Styles ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_styles = new WP_Styles();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // For backward compatibility
</span><span class="cx" style="display: block; padding: 0 10px"> $handle = 0 === strpos( $file, 'css/' ) ? substr( $file, 4 ) : $file;
</span></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-functions.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-includes/ms-functions.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2005,11 +2005,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function is_user_spammy( $user = null ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_a( $user, 'WP_User' ) ) {
- if ( $user )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $user instanceof WP_User ) ) {
+ if ( $user ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = get_user_by( 'login', $user );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = wp_get_current_user();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $user && isset( $user->spam ) && 1 == $user->spam;
</span></span></pre></div>
<a id="trunksrcwpincludespluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pluggable.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-includes/pluggable.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,7 +260,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $phpmailer;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // (Re)create it, if it's gone missing
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !is_object( $phpmailer ) || !is_a( $phpmailer, 'PHPMailer' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $phpmailer instanceof PHPMailer ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-phpmailer.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-smtp.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $phpmailer = new PHPMailer( true );
</span></span></pre></div>
<a id="trunksrcwpincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-includes/post.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -422,7 +422,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $post ) && isset( $GLOBALS['post'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $post = $GLOBALS['post'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_a( $post, 'WP_Post' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $post instanceof WP_Post ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_post = $post;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_object( $post ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $post->filter ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-includes/script-loader.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -778,8 +778,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'wp_print_scripts' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !is_a($wp_scripts, 'WP_Scripts') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_scripts = new WP_Scripts();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> script_concat_settings();
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_scripts->do_concat = $concatenate_scripts;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -808,9 +809,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function print_footer_scripts() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_scripts, $concatenate_scripts;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !is_a($wp_scripts, 'WP_Scripts') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(); // No need to run if not instantiated.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> script_concat_settings();
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_scripts->do_concat = $concatenate_scripts;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_scripts->do_footer_items();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -892,9 +893,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_scripts;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !is_a($wp_scripts, 'WP_Scripts') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(); // no need to run if nothing is queued
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> return print_head_scripts();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -947,8 +948,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function print_admin_styles() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_styles, $concatenate_scripts;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !is_a($wp_styles, 'WP_Styles') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $wp_styles instanceof WP_Styles ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_styles = new WP_Styles();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> script_concat_settings();
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_styles->do_concat = $concatenate_scripts;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -977,8 +979,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function print_late_styles() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_styles, $concatenate_scripts;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !is_a($wp_styles, 'WP_Styles') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $wp_styles instanceof WP_Styles ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_styles->do_concat = $concatenate_scripts;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_styles->do_footer_items();
</span></span></pre></div>
<a id="trunksrcwpincludestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/template.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-includes/template.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $templates = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_a( $author, 'WP_User' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $author instanceof WP_User ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $templates[] = "author-{$author->user_nicename}.php";
</span><span class="cx" style="display: block; padding: 0 10px"> $templates[] = "author-{$author->ID}.php";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-includes/theme.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2027,5 +2027,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function is_customize_preview() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return is_a( $wp_customize, 'WP_Customize_Manager' ) && $wp_customize->is_preview();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return ( $wp_customize instanceof WP_Customize_Manager ) && $wp_customize->is_preview();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-includes/user.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_User|WP_Error WP_User on success, WP_Error on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_authenticate_username_password($user, $username, $password) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_a( $user, 'WP_User' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $user instanceof WP_User ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $user;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +167,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_User|WP_Error WP_User on success, WP_Error on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_authenticate_cookie($user, $username, $password) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_a( $user, 'WP_User' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $user instanceof WP_User ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $user;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,7 +202,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_User|WP_Error WP_User on success, WP_Error if the user is considered a spammer.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_authenticate_spam_check( $user ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $user && is_a( $user, 'WP_User' ) && is_multisite() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $user instanceof WP_User && is_multisite() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter whether the user has been marked as a spammer.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1710,9 +1710,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_insert_user( $userdata ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_a( $userdata, 'stdClass' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $userdata instanceof stdClass ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $userdata = get_object_vars( $userdata );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( is_a( $userdata, 'WP_User' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $userdata instanceof WP_User ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $userdata = $userdata->to_array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // Are we updating or creating?
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1969,10 +1969,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|WP_Error The updated user's ID or a WP_Error object if the user could not be updated.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_update_user($userdata) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_a( $userdata, 'stdClass' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $userdata instanceof stdClass ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $userdata = get_object_vars( $userdata );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- elseif ( is_a( $userdata, 'WP_User' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $userdata instanceof WP_User ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $userdata = $userdata->to_array();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ID = (int) $userdata['ID'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets.php 2015-01-16 00:32:45 UTC (rev 31187)
+++ trunk/src/wp-includes/widgets.php 2015-01-16 01:05:52 UTC (rev 31188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1552,8 +1552,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_widget_factory;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $widget_obj = $wp_widget_factory->widgets[$widget];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !is_a($widget_obj, 'WP_Widget') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $widget_obj instanceof WP_Widget ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $before_widget = sprintf('<div class="widget %s">', $widget_obj->widget_options['classname'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $default_args = array( 'before_widget' => $before_widget, 'after_widget' => "</div>", 'before_title' => '<h2 class="widgettitle">', 'after_title' => '</h2>' );
</span></span></pre>
</div>
</div>
</body>
</html>