Changeset 19687

Timestamp:

01/05/2012 08:50:54 PM (13 years ago)

Author:

ryan

Message:

User lowercase true, false, null instead of uppercase. Props c3mdigital, mfields. fixes #16302

Location:

trunk

Files:

• wp-admin/admin.php (modified) (1 diff)
• wp-admin/includes/image.php (modified) (1 diff)
• wp-admin/includes/plugin.php (modified) (1 diff)
• wp-admin/includes/post.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (5 diffs)
• wp-admin/includes/upgrade.php (modified) (1 diff)
• wp-admin/network/admin.php (modified) (1 diff)
• wp-admin/theme-editor.php (modified) (1 diff)
• wp-admin/user/admin.php (modified) (1 diff)
• wp-app.php (modified) (3 diffs)
• wp-includes/cache.php (modified) (1 diff)
• wp-includes/canonical.php (modified) (1 diff)
• wp-includes/class-http.php (modified) (1 diff)
• wp-includes/class-wp-xmlrpc-server.php (modified) (1 diff)
• wp-includes/comment-template.php (modified) (4 diffs)
• wp-includes/comment.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)
• wp-includes/functions.wp-scripts.php (modified) (1 diff)
• wp-includes/functions.wp-styles.php (modified) (1 diff)
• wp-includes/general-template.php (modified) (1 diff)
• wp-includes/kses.php (modified) (6 diffs)
• wp-includes/link-template.php (modified) (1 diff)
• wp-includes/pluggable.php (modified) (2 diffs)
• wp-includes/query.php (modified) (1 diff)
• wp-includes/shortcodes.php (modified) (1 diff)
• wp-includes/theme.php (modified) (1 diff)
• wp-includes/user.php (modified) (2 diffs)
• wp-login.php (modified) (1 diff)

trunk/wp-admin/admin.php

@@ -13 +13 @@
  */
 if ( ! defined('WP_ADMIN') )
-    define('WP_ADMIN', TRUE);
+    define('WP_ADMIN', true);
 
 if ( ! defined('WP_NETWORK_ADMIN') )
-    define('WP_NETWORK_ADMIN', FALSE);
+    define('WP_NETWORK_ADMIN', false);
 
 if ( ! defined('WP_USER_ADMIN') )
-    define('WP_USER_ADMIN', FALSE);
+    define('WP_USER_ADMIN', false);
 
 if ( ! WP_NETWORK_ADMIN && ! WP_USER_ADMIN ) {
-    define('WP_BLOG_ADMIN', TRUE);
+    define('WP_BLOG_ADMIN', true);
 }
 

trunk/wp-admin/includes/image.php

@@ -105 +105 @@
 
         foreach ( get_intermediate_image_sizes() as $s ) {
-            $sizes[$s] = array( 'width' => '', 'height' => '', 'crop' => FALSE );
+            $sizes[$s] = array( 'width' => '', 'height' => '', 'crop' => false );
             if ( isset( $_wp_additional_image_sizes[$s]['width'] ) )
                 $sizes[$s]['width'] = intval( $_wp_additional_image_sizes[$s]['width'] ); // For theme-added sizes

trunk/wp-admin/includes/plugin.php

@@ -864 +864 @@
  * @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;
 

trunk/wp-admin/includes/post.php

@@ -1143 +1143 @@
  * @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>';

trunk/wp-admin/includes/template.php

@@ -1199 +1199 @@
  * @return array Array of settings errors
  */
-function get_settings_errors( $setting = '', $sanitize = FALSE ) {
+function get_settings_errors( $setting = '', $sanitize = false ) {
     global $wp_settings_errors;
 
@@ -1251 +1251 @@
  * @param boolean $hide_on_update If set to true errors will not be shown if the settings page has already been submitted.
  */
-function settings_errors( $setting = '', $sanitize = FALSE, $hide_on_update = FALSE ) {
+function settings_errors( $setting = '', $sanitize = false, $hide_on_update = false ) {
 
     if ($hide_on_update AND $_GET['settings-updated']) return;
@@ -1588 +1588 @@
  *                     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 );
 }
@@ -1609 +1609 @@
  *                     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' :
@@ -1621 +1621 @@
             $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

trunk/wp-admin/includes/upgrade.php

@@ -1405 +1405 @@
 
     @ $kellogs = unserialize($option);
-    if ($kellogs !== FALSE)
+    if ($kellogs !== false)
         return $kellogs;
     else

trunk/wp-admin/network/admin.php

@@ -8 +8 @@
  */
 
-define( 'WP_NETWORK_ADMIN', TRUE );
+define( 'WP_NETWORK_ADMIN', true );
 
 /** Load WordPress Administration Bootstrap */

trunk/wp-admin/theme-editor.php

@@ -87 +87 @@
         //is_writable() not always reliable, check return value. see comments @ http://uk.php.net/is_writable
         $f = fopen($file, 'w+');
-        if ($f !== FALSE) {
+        if ($f !== false) {
             fwrite($f, $newcontent);
             fclose($f);

trunk/wp-admin/user/admin.php

@@ -8 +8 @@
  */
 
-define('WP_USER_ADMIN', TRUE);
+define('WP_USER_ADMIN', true);
 
 require_once( dirname(dirname(__FILE__)) . '/admin.php');

trunk/wp-app.php

@@ -616 +616 @@
         $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));
@@ -1074 +1074 @@
         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>
@@ -1528 +1528 @@
                 $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:

trunk/wp-includes/cache.php

@@ -497 +497 @@
             $group = 'default';
 
-        if ( NULL === $data )
+        if ( null === $data )
             $data = '';
 

trunk/wp-includes/canonical.php

@@ -396 +396 @@
     }
 
-    // Note that you can use the "redirect_canonical" filter to cancel a canonical redirect for whatever reason by returning FALSE
+    // Note that you can use the "redirect_canonical" filter to cancel a canonical redirect for whatever reason by returning false
     $redirect_url = apply_filters('redirect_canonical', $redirect_url, $requested_url);
 

trunk/wp-includes/class-http.php

@@ -1491 +1491 @@
      *
      * @param string $url URL you intend to send this cookie to
-     * @return boolean TRUE if allowed, FALSE otherwise.
+     * @return boolean true if allowed, false otherwise.
      */
     function test( $url ) {

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

@@ -3079 +3079 @@
         }
 
-        $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']);

trunk/wp-includes/comment-template.php

@@ -770 +770 @@
  * @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);
@@ -787 +787 @@
  * @return bool True if pings are accepted
  */
-function pings_open( $post_id = NULL ) {
+function pings_open( $post_id = null ) {
 
     $_post = get_post($post_id);
@@ -900 +900 @@
     }
 
-    $overridden_cpage = FALSE;
+    $overridden_cpage = false;
     if ( '' == get_query_var('cpage') && get_option('page_comments') ) {
         set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1 );
-        $overridden_cpage = TRUE;
+        $overridden_cpage = true;
     }
 
@@ -1192 +1192 @@
  * @param string $linktoparent Optional. Boolean to control making the author's name a link to their comment.
  */
-function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = TRUE ) {
+function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = true ) {
     global $comment;
 

trunk/wp-includes/comment.php

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

trunk/wp-includes/functions.php

@@ -674 +674 @@
         if ( !empty($key) )
             $k = $key . '%5B' . $k . '%5D';
-        if ( $v === NULL )
+        if ( $v === null )
             continue;
         elseif ( $v === FALSE )
@@ -687 +687 @@
     }
 
-    if ( NULL === $sep )
+    if ( null === $sep )
         $sep = ini_get('arg_separator.output');
 

trunk/wp-includes/functions.wp-scripts.php

@@ -46 +46 @@
  * @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

trunk/wp-includes/functions.wp-styles.php

@@ -75 +75 @@
  * @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.

trunk/wp-includes/general-template.php

@@ -2066 +2066 @@
  * 'wp_print_styles' action has *not* yet been called, the CSS file will be
  * enqueued. If the wp_print_styles action *has* been called, the CSS link will
- * be printed. Printing may be forced by passing TRUE as the $force_echo
+ * be printed. Printing may be forced by passing true as the $force_echo
  * (second) parameter.
  *

trunk/wp-includes/kses.php

@@ -764 +764 @@
                     $working = 1;
                     $mode = 0;
-                    if(FALSE === array_key_exists($attrname, $attrarr)) {
+                    if(false === array_key_exists($attrname, $attrarr)) {
                         $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
                     }
@@ -781 +781 @@
                         $thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
 
-                    if(FALSE === array_key_exists($attrname, $attrarr)) {
+                    if(false === array_key_exists($attrname, $attrarr)) {
                         $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
                     }
@@ -797 +797 @@
                         $thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
 
-                    if(FALSE === array_key_exists($attrname, $attrarr)) {
+                    if(false === array_key_exists($attrname, $attrarr)) {
                         $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
                     }
@@ -813 +813 @@
                         $thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
 
-                    if(FALSE === array_key_exists($attrname, $attrarr)) {
+                    if(false === array_key_exists($attrname, $attrarr)) {
                         $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
                     }
@@ -832 +832 @@
     } # while
 
-    if ($mode == 1 && FALSE === array_key_exists($attrname, $attrarr))
+    if ($mode == 1 && false === array_key_exists($attrname, $attrarr))
         # special case, for when the attribute list ends with a valueless
         # attribute like "selected"
@@ -939 +939 @@
 
 /**
- * Removes any NULL characters in $string.
+ * Removes any null characters in $string.
  *
  * @since 1.0.0

trunk/wp-includes/link-template.php

@@ -2364 +2364 @@
 
     if ( empty( $title ) )
-        $title = the_title_attribute( array( 'echo' => FALSE ) );
+        $title = the_title_attribute( array( 'echo' => false ) );
 
     $shortlink = wp_get_shortlink( $post->ID );

trunk/wp-includes/pluggable.php

@@ -1419 +1419 @@
         require_once( ABSPATH . 'wp-includes/class-phpass.php');
         // By default, use the portable hash from phpass
-        $wp_hasher = new PasswordHash(8, TRUE);
+        $wp_hasher = new PasswordHash(8, true);
     }
 
@@ -1467 +1467 @@
         require_once( ABSPATH . 'wp-includes/class-phpass.php');
         // By default, use the portable hash from phpass
-        $wp_hasher = new PasswordHash(8, TRUE);
+        $wp_hasher = new PasswordHash(8, true);
     }
 

trunk/wp-includes/query.php

@@ -2929 +2929 @@
             return $this->queried_object;
 
-        $this->queried_object = NULL;
+        $this->queried_object = null;
         $this->queried_object_id = 0;
 

trunk/wp-includes/shortcodes.php

@@ -236 +236 @@
     } 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];
     }
 }

trunk/wp-includes/theme.php

@@ -1280 +1280 @@
  * Does not check the default theme, which is the fallback and should always exist.
  * Will switch theme to the fallback theme if current theme does not validate.
- * You can use the 'validate_current_theme' filter to return FALSE to
+ * You can use the 'validate_current_theme' filter to return false to
  * disable this functionality.
  *

trunk/wp-includes/user.php

@@ -154 +154 @@
     global $wpdb;
 
-    $where = get_posts_by_author_sql('post', TRUE, $userid);
+    $where = get_posts_by_author_sql('post', true, $userid);
 
     $count = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->posts $where" );
@@ -854 +854 @@
         $select_count = array();
         foreach ( $avail_roles as $this_role => $name ) {
-            $select_count[] = "COUNT(NULLIF(`meta_value` LIKE '%" . like_escape($this_role) . "%', FALSE))";
+            $select_count[] = "COUNT(NULLIF(`meta_value` LIKE '%" . like_escape($this_role) . "%', false))";
         }
         $select_count = implode(', ', $select_count);

trunk/wp-login.php

@@ -604 +604 @@
 
     // Some parts of this script use the main login form to display a message
-    if      ( isset($_GET['loggedout']) && TRUE == $_GET['loggedout'] )
+    if      ( isset($_GET['loggedout']) && true == $_GET['loggedout'] )
         $errors->add('loggedout', __('You are now logged out.'), 'message');
     elseif  ( isset($_GET['registration']) && 'disabled' == $_GET['registration'] )