Ticket #16302: 16302.null.diff
File 16302.null.diff, 10.8 KB (added by , 14 years ago) |
---|
-
wp-app.php
614 614 $slug = substr( md5( uniqid( microtime() ) ), 0, 7); 615 615 $ext = preg_replace( '|.*/([a-z0-9]+)|', '$1', $_SERVER['CONTENT_TYPE'] ); 616 616 $slug = sanitize_file_name( "$slug.$ext" ); 617 $file = wp_upload_bits( $slug, NULL, $bits);617 $file = wp_upload_bits( $slug, null, $bits); 618 618 619 619 log_app('wp_upload_bits returns:',print_r($file,true)); 620 620 … … 1072 1072 1073 1073 log_app('function',"total_count(# $wp_query->max_num_pages #)"); 1074 1074 $last_page = $wp_query->max_num_pages; 1075 $next_page = (($page + 1) > $last_page) ? NULL: $page + 1;1076 $prev_page = ($page - 1) < 1 ? NULL: $page - 1;1077 $last_page = ((int)$last_page == 1 || (int)$last_page == 0) ? NULL: (int) $last_page;1078 $self_page = $page > 1 ? $page : NULL;1075 $next_page = (($page + 1) > $last_page) ? null : $page + 1; 1076 $prev_page = ($page - 1) < 1 ? null : $page - 1; 1077 $last_page = ((int)$last_page == 1 || (int)$last_page == 0) ? null : (int) $last_page; 1078 $self_page = $page > 1 ? $page : null; 1079 1079 ?><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'); ?> > 1080 1080 <id><?php $this->the_entries_url() ?></id> 1081 1081 <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></updated> … … 1526 1526 global $post; 1527 1527 $post = wp_get_single_post($this->params[1]); 1528 1528 $wp_last_modified = get_post_modified_time('D, d M Y H:i:s', true); 1529 $post = NULL;1529 $post = null; 1530 1530 break; 1531 1531 case $this->ENTRIES_PATH: 1532 1532 $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 42 42 * @param string $src Script url 43 43 * @param array $deps (optional) Array of script names on which this script depends 44 * @param string|bool $ver (optional) Script version (used for cache busting), set to NULLto disable44 * @param string|bool $ver (optional) Script version (used for cache busting), set to null to disable 45 45 * @param bool $in_footer (optional) Whether to enqueue the script before </head> or before </body> 46 46 * @return null 47 47 */ -
wp-includes/pomo/mo.php
53 53 $originals_table .= $this->export_original($entry) . chr(0); 54 54 $length = strlen($this->export_original($entry)); 55 55 fwrite($fh, pack('VV', $length, $current_addr)); 56 $current_addr += $length + 1; // account for the NULLbyte after56 $current_addr += $length + 1; // account for the null byte after 57 57 } 58 58 59 59 $exported_headers = $this->export_headers(); -
wp-includes/comment.php
1116 1116 1117 1117 $approved = $comment->comment_approved; 1118 1118 1119 if ( $approved == NULL)1119 if ( $approved == null ) 1120 1120 return false; 1121 1121 elseif ( $approved == '1' ) 1122 1122 return 'approved'; -
wp-includes/functions.php
1395 1395 $k = $prefix.$k; 1396 1396 if ( !empty($key) ) 1397 1397 $k = $key . '%5B' . $k . '%5D'; 1398 if ( $v === NULL)1398 if ( $v === null ) 1399 1399 continue; 1400 1400 elseif ( $v === FALSE ) 1401 1401 $v = '0'; … … 1408 1408 array_push($ret, $k.'='.$v); 1409 1409 } 1410 1410 1411 if ( NULL=== $sep )1411 if ( null === $sep ) 1412 1412 $sep = ini_get('arg_separator.output'); 1413 1413 1414 1414 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. 770 770 * @return bool True if the comments are open 771 771 */ 772 function comments_open( $post_id =NULL) {772 function comments_open( $post_id = null ) { 773 773 774 774 $_post = get_post($post_id); 775 775 … … 786 786 * @param int $post_id An optional post ID to check instead of the current post. 787 787 * @return bool True if pings are accepted 788 788 */ 789 function pings_open( $post_id = NULL) {789 function pings_open( $post_id = null ) { 790 790 791 791 $_post = get_post($post_id); 792 792 -
wp-includes/shortcodes.php
206 206 return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, $m[5], $tag ) . $m[6]; 207 207 } else { 208 208 // self-closing tag 209 return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, NULL, $tag ) . $m[6];209 return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, null, $tag ) . $m[6]; 210 210 } 211 211 } 212 212 -
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'. 46 46 * @param array $deps Array of handles of any stylesheet that this stylesheet depends on. 47 47 * (Stylesheets that must be loaded before this stylesheet.) Pass an empty array if there are no dependencies. 48 * @param string|bool $ver String specifying the stylesheet version number. Set to NULLto disable.48 * @param string|bool $ver String specifying the stylesheet version number. Set to null to disable. 49 49 * Used to ensure that the correct version is sent to the client regardless of caching. 50 50 * @param string $media The media for which this stylesheet has been defined. 51 51 */ -
wp-includes/class-wp-xmlrpc-server.php
3083 3083 $name = "wpid{$old_file->ID}-{$filename}"; 3084 3084 } 3085 3085 3086 $upload = wp_upload_bits($name, NULL, $bits);3086 $upload = wp_upload_bits($name, null, $bits); 3087 3087 if ( ! empty($upload['error']) ) { 3088 3088 $errorString = sprintf(__('Could not write file %1$s (%2$s)'), $name, $upload['error']); 3089 3089 logIO('O', '(MW) ' . $errorString); -
wp-includes/cache.php
422 422 if ( empty ($group) ) 423 423 $group = 'default'; 424 424 425 if ( NULL=== $data )425 if ( null === $data ) 426 426 $data = ''; 427 427 428 428 if ( is_object($data) ) -
wp-includes/query.php
2923 2923 if ( isset($this->queried_object) ) 2924 2924 return $this->queried_object; 2925 2925 2926 $this->queried_object = NULL;2926 $this->queried_object = null; 2927 2927 $this->queried_object_id = 0; 2928 2928 2929 2929 if ( $this->is_category || $this->is_tag || $this->is_tax ) { -
wp-includes/kses.php
937 937 } 938 938 939 939 /** 940 * Removes any NULLcharacters in $string.940 * Removes any null characters in $string. 941 941 * 942 942 * @since 1.0.0 943 943 * -
wp-admin/includes/plugin.php
863 863 * 864 864 * @return string The resulting page's hook_suffix 865 865 */ 866 function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '', $position = NULL) {866 function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '', $position = null ) { 867 867 global $menu, $admin_page_hooks, $_registered_pages, $_parent_pages; 868 868 869 869 $menu_slug = plugin_basename( $menu_slug ); -
wp-admin/includes/post.php
1193 1193 * @param int $thumbnail_id ID of the attachment used for thumbnail 1194 1194 * @return string html 1195 1195 */ 1196 function _wp_post_thumbnail_html( $thumbnail_id = NULL) {1196 function _wp_post_thumbnail_html( $thumbnail_id = null ) { 1197 1197 global $content_width, $_wp_additional_image_sizes, $post_ID; 1198 1198 $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>'; 1199 1199 $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 2165 2165 * string such as 'tabindex="1"', though the array format is typically cleaner. 2166 2166 */ 2167 function submit_button( $text = NULL, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = NULL) {2167 function submit_button( $text = null, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = null ) { 2168 2168 echo get_submit_button( $text, $type, $name, $wrap, $other_attributes ); 2169 2169 } 2170 2170 … … 2185 2185 * Defaults to no other attributes. Other attributes can also be provided as a 2186 2186 * string such as 'tabindex="1"', though the array format is typically cleaner. 2187 2187 */ 2188 function get_submit_button( $text = NULL, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = NULL) {2188 function get_submit_button( $text = null, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = null ) { 2189 2189 switch ( $type ) : 2190 2190 case 'primary' : 2191 2191 case 'secondary' : … … 2197 2197 default : 2198 2198 $class = $type; // Custom cases can just pass in the classes they want to be used 2199 2199 endswitch; 2200 $text = ( NULL== $text ) ? __( 'Save Changes' ) : $text;2200 $text = ( null == $text ) ? __( 'Save Changes' ) : $text; 2201 2201 2202 2202 // Default the id attribute to $name unless an id was specifically provided in $other_attributes 2203 2203 $id = $name;