Ticket #4968: 4968.2.patch

wp-includes/deprecated.php

@@ -1690 +1690 @@
         the_author_meta('ID');
 }
 
+/**
+ * Strip HTML and put links at the bottom of stripped content.
+ *
+ * Searches for all of the links, strips them out of the content, and places
+ * them at the bottom of the content with numbers.
+ *
+ * @since 0.71
+ * @deprecated 2.9 
+ *
+ * @param string $content Content to get links
+ * @return string HTML stripped out of content with links at the bottom.
+ */
+function make_url_footnote( $content ) {
+        _deprecated_function(__FUNCTION__, '2.9' );     
+}
+
 ?>
+ No newline at end of file

wp-includes/feed.php

@@ -153 +153 @@
  * @see get_the_content() For the $more_link_text, $stripteaser, and $more_file
  *              parameters.
  *
- * @param string $more_link_text Optional. Text to display when more content is available but not displayed.
- * @param int|bool $stripteaser Optional. Default is 0.
- * @param string $more_file Optional.
- * @param int $cut Optional. Amount of words to keep for the content.
- * @param int $encode_html Optional. How to encode the content.
+ * @param string $more_link_text (optional) Text to display when more content is available but not displayed.
+ * @param int|bool $stripteaser (optional) Default is 0.
+ * @param string $more_file (optional)
+ * @param int $cut (optional) Amount of words to keep for the content.
+ * @param int $encode_html (optional) How to encode the content. 0: as-is, 1: esc_html, 2: strip_tags defaults to 0
  */
 function the_content_rss($more_link_text='(more...)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) {
         $content = get_the_content($more_link_text, $stripteaser, $more_file);
         $content = apply_filters('the_content_rss', $content);
         if ( $cut && !$encode_html )
                 $encode_html = 2;
-        if ( 1== $encode_html ) {
+        if ( 1 == $encode_html ) {
                 $content = esc_html($content);
                 $cut = 0;
-        } elseif ( 0 == $encode_html ) {
-                $content = make_url_footnote($content);
         } elseif ( 2 == $encode_html ) {
                 $content = strip_tags($content);
         }

wp-includes/functions.php

@@ -965 +965 @@
 }
 
 /**
- * Strip HTML and put links at the bottom of stripped content.
- *
- * Searches for all of the links, strips them out of the content, and places
- * them at the bottom of the content with numbers.
- *
- * @since 0.71
- *
- * @param string $content Content to get links
- * @return string HTML stripped out of content with links at the bottom.
- */
-function make_url_footnote( $content ) {
-        preg_match_all( '/<a(.+?)href=\"(.+?)\"(.*?)>(.+?)<\/a>/', $content, $matches );
-        $links_summary = "\n";
-        for ( $i=0; $i<count($matches[0]); $i++ ) {
-                $link_match = $matches[0][$i];
-                $link_number = '['.($i+1).']';
-                $link_url = $matches[2][$i];
-                $link_text = $matches[4][$i];
-                $content = str_replace( $link_match, $link_text . ' ' . $link_number, $content );
-                $link_url = ( ( strtolower( substr( $link_url, 0, 7 ) ) != 'http://' ) && ( strtolower( substr( $link_url, 0, 8 ) ) != 'https://' ) ) ? get_option( 'home' ) . $link_url : $link_url;
-                $links_summary .= "\n" . $link_number . ' ' . $link_url;
-        }
-        $content  = strip_tags( $content );
-        $content .= $links_summary;
-        return $content;
-}
-
-/**
  * Retrieve post title from XMLRPC XML.
  *
  * If the title element is not part of the XML, then the default post title from