Ticket #23313: 23313.diff

Index: wp-includes/formatting.php
===================================================================
--- wp-includes/formatting.php  (revision 23355)
+++ wp-includes/formatting.php  (working copy)
@@ -5,7 +5,7 @@
  * Handles many functions for formatting output.
  *
  * @package WordPress
- **/
+ */
 
 /**
  * Replaces common plain text characters into formatted entities
@@ -947,8 +947,18 @@
        return $title;
 }
 
-function sanitize_title_for_query($title) {
-       return sanitize_title($title, '', 'query');
+/**
+ * Sanitizes title for use in a URL.
+ *
+ * @uses sanitize_title()
+ *
+ * @since 3.1
+ *
+ * @param string $title The string to be sanitized.
+ * @return string The sanitized string.
+ */
+function sanitize_title_for_query( $title ) {
+       return sanitize_title( $title, '', 'query' );
 }
 
 /**
@@ -3176,10 +3186,17 @@
        return '<' . $tag . $link . ' target="' . esc_attr( $_links_add_target ) . '">';
 }
 
-// normalize EOL characters and strip duplicate whitespace
+/**
+ * Normalize EOL characters and strip duplicate whitespace.
+ *
+ * @since 2.7
+ *
+ * @param string $str
+ * @return string
+ */
 function normalize_whitespace( $str ) {
-       $str  = trim($str);
-       $str  = str_replace("\r", "\n", $str);
+       $str  = trim( $str );
+       $str  = str_replace( "\r", "\n", $str );
        $str  = preg_replace( array( '/\n+/', '/[ \t]+/' ), array( "\n", ' ' ), $str );
        return $str;
 }