Ticket #16302: 16302.null.diff

wp-app.php

@@ -614 +614 @@
                         $slug = substr( md5( uniqid( microtime() ) ), 0, 7);
                 $ext = preg_replace( '|.*/([a-z0-9]+)|', '$1', $_SERVER['CONTENT_TYPE'] );
                 $slug = sanitize_file_name( "$slug.$ext" );
-                $file = wp_upload_bits( $slug, NULL, $bits);
+                $file = wp_upload_bits( $slug, null, $bits);
 
                 log_app('wp_upload_bits returns:',print_r($file,true));
 
@@ -1072 +1072 @@
 
                 log_app('function',"total_count(# $wp_query->max_num_pages #)");
                 $last_page = $wp_query->max_num_pages;
-                $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;
+                $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;
 ?><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'); ?> >
 <id><?php $this->the_entries_url() ?></id>
 <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></updated>
@@ -1526 +1526 @@
                                 global $post;
                                 $post = wp_get_single_post($this->params[1]);
                                 $wp_last_modified = get_post_modified_time('D, d M Y H:i:s', true);
-                                $post = NULL;
+                                $post = null;
                                 break;
                         case $this->ENTRIES_PATH:
                                 $wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastpostmodified('GMT'), 0).' GMT';

wp-includes/functions.wp-scripts.php

@@ -41 +41 @@
  * @param string $handle Script name
  * @param string $src Script url
  * @param array $deps (optional) Array of script names on which this script depends
- * @param string|bool $ver (optional) Script version (used for cache busting), set to NULL to disable
+ * @param string|bool $ver (optional) Script version (used for cache busting), set to null to disable
  * @param bool $in_footer (optional) Whether to enqueue the script before </head> or before </body>
  * @return null
  */

wp-includes/pomo/mo.php

@@ -53 +53 @@
                         $originals_table .= $this->export_original($entry) . chr(0);
                         $length = strlen($this->export_original($entry));
                         fwrite($fh, pack('VV', $length, $current_addr));
-                        $current_addr += $length + 1; // account for the NULL byte after
+                        $current_addr += $length + 1; // account for the null byte after
                 }
 
                 $exported_headers = $this->export_headers();

wp-includes/comment.php

@@ -1116 +1116 @@
 
         $approved = $comment->comment_approved;
 
-        if ( $approved == NULL )
+        if ( $approved == null )
                 return false;
         elseif ( $approved == '1' )
                 return 'approved';

wp-includes/functions.php

@@ -1395 +1395 @@
                         $k = $prefix.$k;
                 if ( !empty($key) )
                         $k = $key . '%5B' . $k . '%5D';
-                if ( $v === NULL )
+                if ( $v === null )
                         continue;
                 elseif ( $v === FALSE )
                         $v = '0';
@@ -1408 +1408 @@
                         array_push($ret, $k.'='.$v);
         }
 
-        if ( NULL === $sep )
+        if ( null === $sep )
                 $sep = ini_get('arg_separator.output');
 
         return implode($sep, $ret);

wp-includes/comment-template.php

@@ -769 +769 @@
  * @param int $post_id An optional post ID to check instead of the current post.
  * @return bool True if the comments are open
  */
-function comments_open( $post_id=NULL ) {
+function comments_open( $post_id = null ) {
 
         $_post = get_post($post_id);
 
@@ -786 +786 @@
  * @param int $post_id An optional post ID to check instead of the current post.
  * @return bool True if pings are accepted
  */
-function pings_open( $post_id = NULL ) {
+function pings_open( $post_id = null ) {
 
         $_post = get_post($post_id);
 

wp-includes/shortcodes.php

@@ -206 +206 @@
                 return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, $m[5], $tag ) . $m[6];
         } else {
                 // self-closing tag
-                return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, NULL,  $tag ) . $m[6];
+                return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, null,  $tag ) . $m[6];
         }
 }
 

wp-includes/functions.wp-styles.php

@@ -45 +45 @@
  * @param string|bool $src Path to the stylesheet from the root directory of WordPress. Example: '/css/mystyle.css'.
  * @param array $deps Array of handles of any stylesheet that this stylesheet depends on.
  *  (Stylesheets that must be loaded before this stylesheet.) Pass an empty array if there are no dependencies.
- * @param string|bool $ver String specifying the stylesheet version number. Set to NULL to disable.
+ * @param string|bool $ver String specifying the stylesheet version number. Set to null to disable.
  *  Used to ensure that the correct version is sent to the client regardless of caching.
  * @param string $media The media for which this stylesheet has been defined.
  */

wp-includes/class-wp-xmlrpc-server.php

@@ -3083 +3083 @@
                         $name = "wpid{$old_file->ID}-{$filename}";
                 }
 
-                $upload = wp_upload_bits($name, NULL, $bits);
+                $upload = wp_upload_bits($name, null, $bits);
                 if ( ! empty($upload['error']) ) {
                         $errorString = sprintf(__('Could not write file %1$s (%2$s)'), $name, $upload['error']);
                         logIO('O', '(MW) ' . $errorString);

wp-includes/cache.php

@@ -422 +422 @@
                 if ( empty ($group) )
                         $group = 'default';
 
-                if ( NULL === $data )
+                if ( null === $data )
                         $data = '';
 
                 if ( is_object($data) )

wp-includes/query.php

@@ -2923 +2923 @@
                 if ( isset($this->queried_object) )
                         return $this->queried_object;
 
-                $this->queried_object = NULL;
+                $this->queried_object = null;
                 $this->queried_object_id = 0;
 
                 if ( $this->is_category || $this->is_tag || $this->is_tax ) {

wp-includes/kses.php

@@ -937 +937 @@
 }
 
 /**
- * Removes any NULL characters in $string.
+ * Removes any null characters in $string.
  *
  * @since 1.0.0
  *

wp-admin/includes/plugin.php

@@ -863 +863 @@
  *
  * @return string The resulting page's hook_suffix
  */
-function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '', $position = NULL ) {
+function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '', $position = null ) {
         global $menu, $admin_page_hooks, $_registered_pages, $_parent_pages;
 
         $menu_slug = plugin_basename( $menu_slug );

wp-admin/includes/post.php

@@ -1193 +1193 @@
  * @param int $thumbnail_id ID of the attachment used for thumbnail
  * @return string html
  */
-function _wp_post_thumbnail_html( $thumbnail_id = NULL ) {
+function _wp_post_thumbnail_html( $thumbnail_id = null ) {
         global $content_width, $_wp_additional_image_sizes, $post_ID;
         $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>';
         $content = sprintf($set_thumbnail_link, esc_html__( 'Set featured image' ));

wp-admin/includes/template.php

@@ -2164 +2164 @@
  *                     Defaults to no other attributes. Other attributes can also be provided as a
  *                     string such as 'tabindex="1"', though the array format is typically cleaner.
  */
-function submit_button( $text = NULL, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = NULL ) {
+function submit_button( $text = null, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = null ) {
         echo get_submit_button( $text, $type, $name, $wrap, $other_attributes );
 }
 
@@ -2185 +2185 @@
  *                     Defaults to no other attributes. Other attributes can also be provided as a
  *                     string such as 'tabindex="1"', though the array format is typically cleaner.
  */
-function get_submit_button( $text = NULL, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = NULL ) {
+function get_submit_button( $text = null, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = null ) {
         switch ( $type ) :
                 case 'primary' :
                 case 'secondary' :
@@ -2197 +2197 @@
                 default :
                         $class = $type; // Custom cases can just pass in the classes they want to be used
         endswitch;
-        $text = ( NULL == $text ) ? __( 'Save Changes' ) : $text;
+        $text = ( null == $text ) ? __( 'Save Changes' ) : $text;
 
         // Default the id attribute to $name unless an id was specifically provided in $other_attributes
         $id = $name;