Ticket #11386: 11386-deprecated-args.diff

wp-admin/includes/image.php

@@ -19 +19 @@
  * @param int $max_side Maximum length of a single side for the thumbnail.
  * @return string Thumbnail path on success, Error string on failure.
  */
-function wp_create_thumbnail( $file, $max_side, $deprecated = '' ) {
+function wp_create_thumbnail( $file, $max_side ) {
         $thumbpath = image_resize( $file, $max_side, $max_side );
         return apply_filters( 'wp_create_thumbnail', $thumbpath );
 }

wp-admin/includes/meta-boxes.php

@@ -634 +634 @@
  *
  * @param string $class
  * @param string $value
- * @param mixed $deprecated Not used.
  */
-function xfn_check($class, $value = '', $deprecated = '') {
+function xfn_check($class, $value = '') {
         global $link;
 
         $link_rel = isset( $link->link_rel ) ? $link->link_rel : ''; // In PHP 5.3: $link_rel = $link->link_rel ?: '';

wp-admin/includes/upgrade.php

@@ -30 +30 @@
  * @param string $user_name User's username.
  * @param string $user_email User's email.
  * @param bool $public Whether blog is public.
- * @param null $deprecated Optional. Not used.
  * @return array Array keys 'url', 'user_id', 'password', 'password_message'.
  */
-function wp_install($blog_title, $user_name, $user_email, $public, $deprecated='') {
+function wp_install($blog_title, $user_name, $user_email, $public) {
         global $wp_rewrite;
 
         wp_check_mysql_version();

wp-app.php

@@ -884 +884 @@
          *
          * @since 2.2.0
          *
-         * @param mixed $deprecated Optional, not used.
          * @return string
          */
-        function get_categories_url($deprecated = '') {
+        function get_categories_url() {
                 return $this->app_base . $this->CATEGORIES_PATH;
         }
 

wp-includes/author-template.php

@@ -17 +17 @@
  * @uses $authordata The current author's DB object.
  * @uses apply_filters() Calls 'the_author' hook on the author display name.
  *
- * @param string $deprecated Deprecated.
  * @return string The author's display name.
  */
-function get_the_author($deprecated = '') {
+function get_the_author() {
         global $authordata;
         return apply_filters('the_author', is_object($authordata) ? $authordata->display_name : null);
 }
@@ -47 +46 @@
 function the_author($deprecated = '', $deprecated_echo = true) {
         if ( $deprecated_echo )
                 echo get_the_author();
-        return get_the_author();
+        else
+                return get_the_author();
 }
 
 /**
@@ -174 +174 @@
  * @uses $authordata The current author's DB object.
  * @uses get_author_posts_url()
  * @uses get_the_author()
- * @param string $deprecated Deprecated.
  */
-function the_author_posts_link($deprecated = '') {
+function the_author_posts_link() {
         global $authordata;
         $link = sprintf(
                 '<a href="%1$s" title="%2$s">%3$s</a>',

wp-includes/comment-template.php

@@ -503 +503 @@
  *
  * @since 0.71
  *
- * @param string $deprecated Not Used
- * @param bool $deprecated Not Used
  */
-function comments_link( $deprecated = '', $deprecated = '' ) {
+function comments_link() {
         echo get_comments_link();
 }
 
@@ -545 +543 @@
  * @param string $zero Text for no comments
  * @param string $one Text for one comment
  * @param string $more Text for more than one comment
- * @param string $deprecated Not used.
  */
-function comments_number( $zero = false, $one = false, $more = false, $deprecated = '' ) {
+function comments_number( $zero = false, $one = false, $more = false ) {
         global $id;
         $number = get_comments_number($id);
 
@@ -691 +688 @@
  * @since 0.71
  * @uses get_trackback_url() Gets the trackback url for the current post
  *
- * @param bool $deprecated Remove backwards compat in 2.5
+ * @param bool $deprecated_echo Remove backwards compat in 2.5
  * @return void|string Should only be used to echo the trackback URL, use get_trackback_url() for the result instead.
  */
-function trackback_url($deprecated = true) {
-        if ($deprecated) echo get_trackback_url();
-        else return get_trackback_url();
+function trackback_url($deprecated_echo = true) {
+        if ( $deprecated_echo )
+                echo get_trackback_url();
+        else
+                return get_trackback_url();
 }
 
 /**
@@ -704 +703 @@
  *
  * @since 0.71
  *
- * @param int $deprecated Not used (Was $timezone = 0)
  */
-function trackback_rdf($deprecated = '') {
+function trackback_rdf() {
         if (stripos($_SERVER['HTTP_USER_AGENT'], 'W3C_Validator') === false) {
                 echo '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
                                 xmlns:dc="http://purl.org/dc/elements/1.1/"

wp-includes/comment.php

@@ -1450 +1450 @@
  * @since 1.5.0
  *
  * @param string $url URL to ping.
- * @param int $deprecated Not Used.
  * @return bool|string False on failure, string containing URI on success.
  */
-function discover_pingback_server_uri($url, $deprecated = 2048) {
+function discover_pingback_server_uri($url) {
 
         $pingback_str_dquote = 'rel="pingback"';
         $pingback_str_squote = 'rel=\'pingback\'';

wp-includes/formatting.php

@@ -862 +862 @@
  * @since 0.71
  *
  * @param string $content String of characters to be converted.
- * @param string $deprecated Not used.
  * @return string Converted string.
  */
-function convert_chars($content, $deprecated = '') {
+function convert_chars($content) {
         // Translation of invalid Unicode references range to valid range
         $wp_htmltranswinuni = array(
         '€' => '€', // the Euro sign

wp-includes/functions.php

@@ -1184 +1184 @@
  *
  * @param string $url URL to fetch.
  * @param string|bool $file_path Optional. File path to write request to.
- * @param bool $deprecated Deprecated. Not used.
  * @return bool|string False on failure and string of headers if HEAD request.
  */
-function wp_get_http( $url, $file_path = false, $deprecated = false ) {
+function wp_get_http( $url, $file_path = false ) {
         @set_time_limit( 60 );
 
         $options = array();
@@ -1226 +1225 @@
  * @since 1.5.1
  *
  * @param string $url
- * @param bool $deprecated Not Used.
  * @return bool|string False on failure, headers on success.
  */
-function wp_get_http_headers( $url, $deprecated = false ) {
+function wp_get_http_headers( $url ) {
         $response = wp_remote_head( $url );
 
         if ( is_wp_error( $response ) )

wp-includes/kses.php

@@ -1196 +1196 @@
 add_action('init', 'kses_init');
 add_action('set_current_user', 'kses_init');
 
-function safecss_filter_attr( $css, $deprecated = '' ) {
+function safecss_filter_attr( $css ) {
         $css = wp_kses_no_null($css);
         $css = str_replace(array("\n","\r","\t"), '', $css);
 

wp-includes/link-template.php

@@ -165 +165 @@
  * @since 1.0.0
  *
  * @param int $post_id Optional. Post ID.
- * @param mixed $deprecated Not used.
  * @return string
  */
-function post_permalink($post_id = 0, $deprecated = '') {
+function post_permalink($post_id = 0) {
         return get_permalink($post_id);
 }
 

wp-includes/pluggable.php

@@ -1684 +1685 @@
  *
  * @param string $username User's username
  * @param string $password User's password
- * @param bool $deprecated Not used
  * @return bool False on login failure, true on successful check
  */
-function wp_login($username, $password, $deprecated = '') {
+function wp_login($username, $password) {
         global $error;
 
         $user = wp_authenticate($username, $password);

wp-includes/post-template.php

@@ -242 +242 @@
  *
  * @since 0.71
  *
- * @param mixed $deprecated Not used.
  * @return string
  */
-function get_the_excerpt($deprecated = '') {
+function get_the_excerpt() {
         global $post;
         $output = $post->post_excerpt;
         if ( post_password_required($post) ) {

wp-includes/widgets.php

@@ -980 +980 @@
  * @since 2.2.0
  * @access private
  *
- * @param bool $update Optional, deprecated.
  * @return array Upgraded list of widgets to version 3 array format when called from the admin.
  */
-function wp_get_sidebars_widgets($deprecated = true) {
+function wp_get_sidebars_widgets() {
         global $wp_registered_widgets, $wp_registered_sidebars, $_wp_sidebars_widgets;
 
         // If loading from front page, consult $_wp_sidebars_widgets rather than options