<!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>[19687] trunk: User lowercase true, false, null instead of uppercase.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19687">19687</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-01-05 20:50:54 +0000 (Thu, 05 Jan 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>User lowercase true, false, null instead of uppercase. Props c3mdigital, mfields. fixes <a href="http://core.trac.wordpress.org/ticket/16302">#16302</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminphp">trunk/wp-admin/admin.php</a></li>
<li><a href="#trunkwpadminincludesimagephp">trunk/wp-admin/includes/image.php</a></li>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpadminnetworkadminphp">trunk/wp-admin/network/admin.php</a></li>
<li><a href="#trunkwpadminthemeeditorphp">trunk/wp-admin/theme-editor.php</a></li>
<li><a href="#trunkwpadminuseradminphp">trunk/wp-admin/user/admin.php</a></li>
<li><a href="#trunkwpappphp">trunk/wp-app.php</a></li>
<li><a href="#trunkwpincludescachephp">trunk/wp-includes/cache.php</a></li>
<li><a href="#trunkwpincludescanonicalphp">trunk/wp-includes/canonical.php</a></li>
<li><a href="#trunkwpincludesclasshttpphp">trunk/wp-includes/class-http.php</a></li>
<li><a href="#trunkwpincludesclasswpxmlrpcserverphp">trunk/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesfunctionswpscriptsphp">trunk/wp-includes/functions.wp-scripts.php</a></li>
<li><a href="#trunkwpincludesfunctionswpstylesphp">trunk/wp-includes/functions.wp-styles.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludesksesphp">trunk/wp-includes/kses.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludesshortcodesphp">trunk/wp-includes/shortcodes.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-admin/admin.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -12,16 +12,16 @@
</span><span class="cx"> * @since 2.3.2
</span><span class="cx"> */
</span><span class="cx"> if ( ! defined('WP_ADMIN') )
</span><del>- define('WP_ADMIN', TRUE);
</del><ins>+ define('WP_ADMIN', true);
</ins><span class="cx">
</span><span class="cx"> if ( ! defined('WP_NETWORK_ADMIN') )
</span><del>- define('WP_NETWORK_ADMIN', FALSE);
</del><ins>+ define('WP_NETWORK_ADMIN', false);
</ins><span class="cx">
</span><span class="cx"> if ( ! defined('WP_USER_ADMIN') )
</span><del>- define('WP_USER_ADMIN', FALSE);
</del><ins>+ define('WP_USER_ADMIN', false);
</ins><span class="cx">
</span><span class="cx"> if ( ! WP_NETWORK_ADMIN && ! WP_USER_ADMIN ) {
</span><del>- define('WP_BLOG_ADMIN', TRUE);
</del><ins>+ define('WP_BLOG_ADMIN', true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') )
</span></span></pre></div>
<a id="trunkwpadminincludesimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/image.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-admin/includes/image.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> global $_wp_additional_image_sizes;
</span><span class="cx">
</span><span class="cx"> foreach ( get_intermediate_image_sizes() as $s ) {
</span><del>- $sizes[$s] = array( 'width' => '', 'height' => '', 'crop' => FALSE );
</del><ins>+ $sizes[$s] = array( 'width' => '', 'height' => '', 'crop' => false );
</ins><span class="cx"> if ( isset( $_wp_additional_image_sizes[$s]['width'] ) )
</span><span class="cx"> $sizes[$s]['width'] = intval( $_wp_additional_image_sizes[$s]['width'] ); // For theme-added sizes
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-admin/includes/plugin.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -863,7 +863,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @return string The resulting page's hook_suffix
</span><span class="cx"> */
</span><del>-function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '', $position = NULL ) {
</del><ins>+function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '', $position = null ) {
</ins><span class="cx"> global $menu, $admin_page_hooks, $_registered_pages, $_parent_pages;
</span><span class="cx">
</span><span class="cx"> $menu_slug = plugin_basename( $menu_slug );
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-admin/includes/post.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -1142,7 +1142,7 @@
</span><span class="cx"> * @param int $thumbnail_id ID of the attachment used for thumbnail
</span><span class="cx"> * @return string html
</span><span class="cx"> */
</span><del>-function _wp_post_thumbnail_html( $thumbnail_id = NULL ) {
</del><ins>+function _wp_post_thumbnail_html( $thumbnail_id = null ) {
</ins><span class="cx"> global $content_width, $_wp_additional_image_sizes, $post_ID;
</span><span class="cx"> $set_thumbnail_link = '<p class="hide-if-no-js"><a title="' . esc_attr__( 'Set featured image' ) . '" href="' . esc_url( get_upload_iframe_src('image') ) . '" id="set-post-thumbnail" class="thickbox">%s</a></p>';
</span><span class="cx"> $content = sprintf($set_thumbnail_link, esc_html__( 'Set featured image' ));
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-admin/includes/template.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -1198,7 +1198,7 @@
</span><span class="cx"> * @param boolean $sanitize Whether to re-sanitize the setting value before returning errors.
</span><span class="cx"> * @return array Array of settings errors
</span><span class="cx"> */
</span><del>-function get_settings_errors( $setting = '', $sanitize = FALSE ) {
</del><ins>+function get_settings_errors( $setting = '', $sanitize = false ) {
</ins><span class="cx"> global $wp_settings_errors;
</span><span class="cx">
</span><span class="cx"> // If $sanitize is true, manually re-run the sanitizisation for this option
</span><span class="lines">@@ -1250,7 +1250,7 @@
</span><span class="cx"> * @param boolean $sanitize Whether to re-sanitize the setting value before returning errors.
</span><span class="cx"> * @param boolean $hide_on_update If set to true errors will not be shown if the settings page has already been submitted.
</span><span class="cx"> */
</span><del>-function settings_errors( $setting = '', $sanitize = FALSE, $hide_on_update = FALSE ) {
</del><ins>+function settings_errors( $setting = '', $sanitize = false, $hide_on_update = false ) {
</ins><span class="cx">
</span><span class="cx"> if ($hide_on_update AND $_GET['settings-updated']) return;
</span><span class="cx">
</span><span class="lines">@@ -1587,7 +1587,7 @@
</span><span class="cx"> * Defaults to no other attributes. Other attributes can also be provided as a
</span><span class="cx"> * string such as 'tabindex="1"', though the array format is typically cleaner.
</span><span class="cx"> */
</span><del>-function submit_button( $text = NULL, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = NULL ) {
</del><ins>+function submit_button( $text = null, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = null ) {
</ins><span class="cx"> echo get_submit_button( $text, $type, $name, $wrap, $other_attributes );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1608,7 +1608,7 @@
</span><span class="cx"> * Defaults to no other attributes. Other attributes can also be provided as a
</span><span class="cx"> * string such as 'tabindex="1"', though the array format is typically cleaner.
</span><span class="cx"> */
</span><del>-function get_submit_button( $text = NULL, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = NULL ) {
</del><ins>+function get_submit_button( $text = null, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = null ) {
</ins><span class="cx"> switch ( $type ) :
</span><span class="cx"> case 'primary' :
</span><span class="cx"> case 'secondary' :
</span><span class="lines">@@ -1620,7 +1620,7 @@
</span><span class="cx"> default :
</span><span class="cx"> $class = $type; // Custom cases can just pass in the classes they want to be used
</span><span class="cx"> endswitch;
</span><del>- $text = ( NULL == $text ) ? __( 'Save Changes' ) : $text;
</del><ins>+ $text = ( null == $text ) ? __( 'Save Changes' ) : $text;
</ins><span class="cx">
</span><span class="cx"> // Default the id attribute to $name unless an id was specifically provided in $other_attributes
</span><span class="cx"> $id = $name;
</span></span></pre></div>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-admin/includes/upgrade.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -1404,7 +1404,7 @@
</span><span class="cx"> $option = preg_replace('|/+$|', '', $option);
</span><span class="cx">
</span><span class="cx"> @ $kellogs = unserialize($option);
</span><del>- if ($kellogs !== FALSE)
</del><ins>+ if ($kellogs !== false)
</ins><span class="cx"> return $kellogs;
</span><span class="cx"> else
</span><span class="cx"> return $option;
</span></span></pre></div>
<a id="trunkwpadminnetworkadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/admin.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/admin.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-admin/network/admin.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx">
</span><del>-define( 'WP_NETWORK_ADMIN', TRUE );
</del><ins>+define( 'WP_NETWORK_ADMIN', true );
</ins><span class="cx">
</span><span class="cx"> /** Load WordPress Administration Bootstrap */
</span><span class="cx"> require_once( dirname( dirname( __FILE__ ) ) . '/admin.php' );
</span></span></pre></div>
<a id="trunkwpadminthemeeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-editor.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-editor.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-admin/theme-editor.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> if (is_writeable($file)) {
</span><span class="cx"> //is_writable() not always reliable, check return value. see comments @ http://uk.php.net/is_writable
</span><span class="cx"> $f = fopen($file, 'w+');
</span><del>- if ($f !== FALSE) {
</del><ins>+ if ($f !== false) {
</ins><span class="cx"> fwrite($f, $newcontent);
</span><span class="cx"> fclose($f);
</span><span class="cx"> $location = "theme-editor.php?file=$file&theme=$theme&a=te&scrollto=$scrollto";
</span></span></pre></div>
<a id="trunkwpadminuseradminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user/admin.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user/admin.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-admin/user/admin.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx">
</span><del>-define('WP_USER_ADMIN', TRUE);
</del><ins>+define('WP_USER_ADMIN', true);
</ins><span class="cx">
</span><span class="cx"> require_once( dirname(dirname(__FILE__)) . '/admin.php');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpappphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-app.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-app.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-app.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -615,7 +615,7 @@
</span><span class="cx"> $slug = substr( md5( uniqid( microtime() ) ), 0, 7);
</span><span class="cx"> $ext = preg_replace( '|.*/([a-z0-9]+)|', '$1', $_SERVER['CONTENT_TYPE'] );
</span><span class="cx"> $slug = sanitize_file_name( "$slug.$ext" );
</span><del>- $file = wp_upload_bits( $slug, NULL, $bits);
</del><ins>+ $file = wp_upload_bits( $slug, null, $bits);
</ins><span class="cx">
</span><span class="cx"> log_app('wp_upload_bits returns:',print_r($file,true));
</span><span class="cx">
</span><span class="lines">@@ -1073,10 +1073,10 @@
</span><span class="cx">
</span><span class="cx"> log_app('function',"total_count(# $wp_query->max_num_pages #)");
</span><span class="cx"> $last_page = $wp_query->max_num_pages;
</span><del>- $next_page = (($page + 1) > $last_page) ? NULL : $page + 1;
- $prev_page = ($page - 1) < 1 ? NULL : $page - 1;
- $last_page = ((int)$last_page == 1 || (int)$last_page == 0) ? NULL : (int) $last_page;
- $self_page = $page > 1 ? $page : NULL;
</del><ins>+ $next_page = (($page + 1) > $last_page) ? null : $page + 1;
+ $prev_page = ($page - 1) < 1 ? null : $page - 1;
+ $last_page = ((int)$last_page == 1 || (int)$last_page == 0) ? null : (int) $last_page;
+ $self_page = $page > 1 ? $page : null;
</ins><span class="cx"> ?><feed xmlns="<?php echo $this->ATOM_NS ?>" xmlns:app="<?php echo $this->ATOMPUB_NS ?>" xml:lang="<?php echo get_option('rss_language'); ?>" <?php do_action('app_ns'); ?> >
</span><span class="cx"> <id><?php $this->the_entries_url() ?></id>
</span><span class="cx"> <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></updated>
</span><span class="lines">@@ -1527,7 +1527,7 @@
</span><span class="cx"> global $post;
</span><span class="cx"> $post = wp_get_single_post($this->params[1]);
</span><span class="cx"> $wp_last_modified = get_post_modified_time('D, d M Y H:i:s', true);
</span><del>- $post = NULL;
</del><ins>+ $post = null;
</ins><span class="cx"> break;
</span><span class="cx"> case $this->ENTRIES_PATH:
</span><span class="cx"> $wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastpostmodified('GMT'), 0).' GMT';
</span></span></pre></div>
<a id="trunkwpincludescachephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/cache.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/cache.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-includes/cache.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -496,7 +496,7 @@
</span><span class="cx"> if ( empty ($group) )
</span><span class="cx"> $group = 'default';
</span><span class="cx">
</span><del>- if ( NULL === $data )
</del><ins>+ if ( null === $data )
</ins><span class="cx"> $data = '';
</span><span class="cx">
</span><span class="cx"> if ( is_object($data) )
</span></span></pre></div>
<a id="trunkwpincludescanonicalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/canonical.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-includes/canonical.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx"> $requested_url = preg_replace_callback('|%[a-fA-F0-9][a-fA-F0-9]|', 'lowercase_octets', $requested_url);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Note that you can use the "redirect_canonical" filter to cancel a canonical redirect for whatever reason by returning FALSE
</del><ins>+ // Note that you can use the "redirect_canonical" filter to cancel a canonical redirect for whatever reason by returning false
</ins><span class="cx"> $redirect_url = apply_filters('redirect_canonical', $redirect_url, $requested_url);
</span><span class="cx">
</span><span class="cx"> if ( !$redirect_url || $redirect_url == $requested_url ) // yes, again -- in case the filter aborted the request
</span></span></pre></div>
<a id="trunkwpincludesclasshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-http.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-http.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-includes/class-http.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -1490,7 +1490,7 @@
</span><span class="cx"> * @since 2.8.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $url URL you intend to send this cookie to
</span><del>- * @return boolean TRUE if allowed, FALSE otherwise.
</del><ins>+ * @return boolean true if allowed, false otherwise.
</ins><span class="cx"> */
</span><span class="cx"> function test( $url ) {
</span><span class="cx"> // Expires - if expired then nothing else matters
</span></span></pre></div>
<a id="trunkwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-xmlrpc-server.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-xmlrpc-server.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-includes/class-wp-xmlrpc-server.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -3078,7 +3078,7 @@
</span><span class="cx"> $name = "wpid{$old_file->ID}-{$filename}";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $upload = wp_upload_bits($name, NULL, $bits);
</del><ins>+ $upload = wp_upload_bits($name, null, $bits);
</ins><span class="cx"> if ( ! empty($upload['error']) ) {
</span><span class="cx"> $errorString = sprintf(__('Could not write file %1$s (%2$s)'), $name, $upload['error']);
</span><span class="cx"> logIO('O', '(MW) ' . $errorString);
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-includes/comment-template.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -769,7 +769,7 @@
</span><span class="cx"> * @param int $post_id An optional post ID to check instead of the current post.
</span><span class="cx"> * @return bool True if the comments are open
</span><span class="cx"> */
</span><del>-function comments_open( $post_id=NULL ) {
</del><ins>+function comments_open( $post_id = null ) {
</ins><span class="cx">
</span><span class="cx"> $_post = get_post($post_id);
</span><span class="cx">
</span><span class="lines">@@ -786,7 +786,7 @@
</span><span class="cx"> * @param int $post_id An optional post ID to check instead of the current post.
</span><span class="cx"> * @return bool True if pings are accepted
</span><span class="cx"> */
</span><del>-function pings_open( $post_id = NULL ) {
</del><ins>+function pings_open( $post_id = null ) {
</ins><span class="cx">
</span><span class="cx"> $_post = get_post($post_id);
</span><span class="cx">
</span><span class="lines">@@ -899,10 +899,10 @@
</span><span class="cx"> $comments_by_type = &$wp_query->comments_by_type;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $overridden_cpage = FALSE;
</del><ins>+ $overridden_cpage = false;
</ins><span class="cx"> if ( '' == get_query_var('cpage') && get_option('page_comments') ) {
</span><span class="cx"> set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1 );
</span><del>- $overridden_cpage = TRUE;
</del><ins>+ $overridden_cpage = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !defined('COMMENTS_TEMPLATE') || !COMMENTS_TEMPLATE)
</span><span class="lines">@@ -1191,7 +1191,7 @@
</span><span class="cx"> * @param string $replytext Optional. Text to display when replying to a comment. Accepts "%s" for the author of the comment being replied to.
</span><span class="cx"> * @param string $linktoparent Optional. Boolean to control making the author's name a link to their comment.
</span><span class="cx"> */
</span><del>-function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = TRUE ) {
</del><ins>+function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = true ) {
</ins><span class="cx"> global $comment;
</span><span class="cx">
</span><span class="cx"> if ( false === $noreplytext ) $noreplytext = __( 'Leave a Reply' );
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-includes/comment.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -1134,7 +1134,7 @@
</span><span class="cx">
</span><span class="cx"> $approved = $comment->comment_approved;
</span><span class="cx">
</span><del>- if ( $approved == NULL )
</del><ins>+ if ( $approved == null )
</ins><span class="cx"> return false;
</span><span class="cx"> elseif ( $approved == '1' )
</span><span class="cx"> return 'approved';
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-includes/functions.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -673,7 +673,7 @@
</span><span class="cx"> $k = $prefix.$k;
</span><span class="cx"> if ( !empty($key) )
</span><span class="cx"> $k = $key . '%5B' . $k . '%5D';
</span><del>- if ( $v === NULL )
</del><ins>+ if ( $v === null )
</ins><span class="cx"> continue;
</span><span class="cx"> elseif ( $v === FALSE )
</span><span class="cx"> $v = '0';
</span><span class="lines">@@ -686,7 +686,7 @@
</span><span class="cx"> array_push($ret, $k.'='.$v);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( NULL === $sep )
</del><ins>+ if ( null === $sep )
</ins><span class="cx"> $sep = ini_get('arg_separator.output');
</span><span class="cx">
</span><span class="cx"> return implode($sep, $ret);
</span></span></pre></div>
<a id="trunkwpincludesfunctionswpscriptsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.wp-scripts.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.wp-scripts.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-includes/functions.wp-scripts.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> * @param string $handle Script name
</span><span class="cx"> * @param string $src Script url
</span><span class="cx"> * @param array $deps (optional) Array of script names on which this script depends
</span><del>- * @param string|bool $ver (optional) Script version (used for cache busting), set to NULL to disable
</del><ins>+ * @param string|bool $ver (optional) Script version (used for cache busting), set to null to disable
</ins><span class="cx"> * @param bool $in_footer (optional) Whether to enqueue the script before </head> or before </body>
</span><span class="cx"> * @return null
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesfunctionswpstylesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.wp-styles.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.wp-styles.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-includes/functions.wp-styles.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> * @param string|bool $src Path to the stylesheet from the root directory of WordPress. Example: '/css/mystyle.css'.
</span><span class="cx"> * @param array $deps Array of handles of any stylesheet that this stylesheet depends on.
</span><span class="cx"> * (Stylesheets that must be loaded before this stylesheet.) Pass an empty array if there are no dependencies.
</span><del>- * @param string|bool $ver String specifying the stylesheet version number. Set to NULL to disable.
</del><ins>+ * @param string|bool $ver String specifying the stylesheet version number. Set to null to disable.
</ins><span class="cx"> * Used to ensure that the correct version is sent to the client regardless of caching.
</span><span class="cx"> * @param string $media The media for which this stylesheet has been defined.
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-includes/general-template.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -2065,7 +2065,7 @@
</span><span class="cx"> * "Intelligently" decides to enqueue or to print the CSS file. If the
</span><span class="cx"> * 'wp_print_styles' action has *not* yet been called, the CSS file will be
</span><span class="cx"> * enqueued. If the wp_print_styles action *has* been called, the CSS link will
</span><del>- * be printed. Printing may be forced by passing TRUE as the $force_echo
</del><ins>+ * be printed. Printing may be forced by passing true as the $force_echo
</ins><span class="cx"> * (second) parameter.
</span><span class="cx"> *
</span><span class="cx"> * For backward compatibility with WordPress 2.3 calling method: If the $file
</span></span></pre></div>
<a id="trunkwpincludesksesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/kses.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/kses.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-includes/kses.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -763,7 +763,7 @@
</span><span class="cx"> {
</span><span class="cx"> $working = 1;
</span><span class="cx"> $mode = 0;
</span><del>- if(FALSE === array_key_exists($attrname, $attrarr)) {
</del><ins>+ if(false === array_key_exists($attrname, $attrarr)) {
</ins><span class="cx"> $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
</span><span class="cx"> }
</span><span class="cx"> $attr = preg_replace('/^\s+/', '', $attr);
</span><span class="lines">@@ -780,7 +780,7 @@
</span><span class="cx"> if ( in_array(strtolower($attrname), $uris) )
</span><span class="cx"> $thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
</span><span class="cx">
</span><del>- if(FALSE === array_key_exists($attrname, $attrarr)) {
</del><ins>+ if(false === array_key_exists($attrname, $attrarr)) {
</ins><span class="cx"> $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
</span><span class="cx"> }
</span><span class="cx"> $working = 1;
</span><span class="lines">@@ -796,7 +796,7 @@
</span><span class="cx"> if ( in_array(strtolower($attrname), $uris) )
</span><span class="cx"> $thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
</span><span class="cx">
</span><del>- if(FALSE === array_key_exists($attrname, $attrarr)) {
</del><ins>+ if(false === array_key_exists($attrname, $attrarr)) {
</ins><span class="cx"> $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
</span><span class="cx"> }
</span><span class="cx"> $working = 1;
</span><span class="lines">@@ -812,7 +812,7 @@
</span><span class="cx"> if ( in_array(strtolower($attrname), $uris) )
</span><span class="cx"> $thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
</span><span class="cx">
</span><del>- if(FALSE === array_key_exists($attrname, $attrarr)) {
</del><ins>+ if(false === array_key_exists($attrname, $attrarr)) {
</ins><span class="cx"> $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
</span><span class="cx"> }
</span><span class="cx"> # We add quotes to conform to W3C's HTML spec.
</span><span class="lines">@@ -831,7 +831,7 @@
</span><span class="cx"> }
</span><span class="cx"> } # while
</span><span class="cx">
</span><del>- if ($mode == 1 && FALSE === array_key_exists($attrname, $attrarr))
</del><ins>+ if ($mode == 1 && false === array_key_exists($attrname, $attrarr))
</ins><span class="cx"> # special case, for when the attribute list ends with a valueless
</span><span class="cx"> # attribute like "selected"
</span><span class="cx"> $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
</span><span class="lines">@@ -938,7 +938,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Removes any NULL characters in $string.
</del><ins>+ * Removes any null characters in $string.
</ins><span class="cx"> *
</span><span class="cx"> * @since 1.0.0
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-includes/link-template.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -2363,7 +2363,7 @@
</span><span class="cx"> $text = __('This is the short link.');
</span><span class="cx">
</span><span class="cx"> if ( empty( $title ) )
</span><del>- $title = the_title_attribute( array( 'echo' => FALSE ) );
</del><ins>+ $title = the_title_attribute( array( 'echo' => false ) );
</ins><span class="cx">
</span><span class="cx"> $shortlink = wp_get_shortlink( $post->ID );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-includes/pluggable.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -1418,7 +1418,7 @@
</span><span class="cx"> if ( empty($wp_hasher) ) {
</span><span class="cx"> require_once( ABSPATH . 'wp-includes/class-phpass.php');
</span><span class="cx"> // By default, use the portable hash from phpass
</span><del>- $wp_hasher = new PasswordHash(8, TRUE);
</del><ins>+ $wp_hasher = new PasswordHash(8, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $wp_hasher->HashPassword($password);
</span><span class="lines">@@ -1466,7 +1466,7 @@
</span><span class="cx"> if ( empty($wp_hasher) ) {
</span><span class="cx"> require_once( ABSPATH . 'wp-includes/class-phpass.php');
</span><span class="cx"> // By default, use the portable hash from phpass
</span><del>- $wp_hasher = new PasswordHash(8, TRUE);
</del><ins>+ $wp_hasher = new PasswordHash(8, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $check = $wp_hasher->CheckPassword($password, $hash);
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-includes/query.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -2928,7 +2928,7 @@
</span><span class="cx"> if ( isset($this->queried_object) )
</span><span class="cx"> return $this->queried_object;
</span><span class="cx">
</span><del>- $this->queried_object = NULL;
</del><ins>+ $this->queried_object = null;
</ins><span class="cx"> $this->queried_object_id = 0;
</span><span class="cx">
</span><span class="cx"> if ( $this->is_category || $this->is_tag || $this->is_tax ) {
</span></span></pre></div>
<a id="trunkwpincludesshortcodesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/shortcodes.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/shortcodes.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-includes/shortcodes.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, $m[5], $tag ) . $m[6];
</span><span class="cx"> } else {
</span><span class="cx"> // self-closing tag
</span><del>- return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, NULL, $tag ) . $m[6];
</del><ins>+ return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, null, $tag ) . $m[6];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-includes/theme.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -1279,7 +1279,7 @@
</span><span class="cx"> *
</span><span class="cx"> * Does not check the default theme, which is the fallback and should always exist.
</span><span class="cx"> * Will switch theme to the fallback theme if current theme does not validate.
</span><del>- * You can use the 'validate_current_theme' filter to return FALSE to
</del><ins>+ * You can use the 'validate_current_theme' filter to return false to
</ins><span class="cx"> * disable this functionality.
</span><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-includes/user.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> function count_user_posts($userid) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- $where = get_posts_by_author_sql('post', TRUE, $userid);
</del><ins>+ $where = get_posts_by_author_sql('post', true, $userid);
</ins><span class="cx">
</span><span class="cx"> $count = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->posts $where" );
</span><span class="cx">
</span><span class="lines">@@ -853,7 +853,7 @@
</span><span class="cx"> // Build a CPU-intensive query that will return concise information.
</span><span class="cx"> $select_count = array();
</span><span class="cx"> foreach ( $avail_roles as $this_role => $name ) {
</span><del>- $select_count[] = "COUNT(NULLIF(`meta_value` LIKE '%" . like_escape($this_role) . "%', FALSE))";
</del><ins>+ $select_count[] = "COUNT(NULLIF(`meta_value` LIKE '%" . like_escape($this_role) . "%', false))";
</ins><span class="cx"> }
</span><span class="cx"> $select_count = implode(', ', $select_count);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-login.php (19686 => 19687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2012-01-05 20:38:40 UTC (rev 19686)
+++ trunk/wp-login.php 2012-01-05 20:50:54 UTC (rev 19687)
</span><span class="lines">@@ -603,7 +603,7 @@
</span><span class="cx"> $errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress."));
</span><span class="cx">
</span><span class="cx"> // Some parts of this script use the main login form to display a message
</span><del>- if ( isset($_GET['loggedout']) && TRUE == $_GET['loggedout'] )
</del><ins>+ if ( isset($_GET['loggedout']) && true == $_GET['loggedout'] )
</ins><span class="cx"> $errors->add('loggedout', __('You are now logged out.'), 'message');
</span><span class="cx"> elseif ( isset($_GET['registration']) && 'disabled' == $_GET['registration'] )
</span><span class="cx"> $errors->add('registerdisabled', __('User registration is currently not allowed.'));
</span></span></pre>
</div>
</div>
</body>
</html>