Fix _deprecated_function() and _deprecated_file() so that they work correctly. Props JonathanRogers and DD32.

westi · westi · commit 232bc0c1e2f2 · 2008-05-04T10:44:44.000Z
git-svn-id: https://develop.svn.wordpress.org/trunk@7884 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
@@ -1670,9 +1670,9 @@ function _deprecated_function($function, $version, $replacement=null) {
 	// Allow plugin to filter the output error trigger
 	if( defined('WP_DEBUG') && ( true === WP_DEBUG ) && apply_filters( 'deprecated_function_trigger_error', true )) {
 		if( !is_null($replacement) )
-			trigger_error( printf( __("%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead."), $function, $version, $replacement ) );
+			trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
 		else
-			trigger_error( printf( __("%1$s is <strong>deprecated</strong> since version %2$s with no alternative available."), $function, $version ) );
+			trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
 	}
 }
 
@@ -1705,9 +1705,9 @@ function _deprecated_file($file, $version, $replacement=null) {
 	// Allow plugin to filter the output error trigger
 	if( defined('WP_DEBUG') && ( true === WP_DEBUG ) && apply_filters( 'deprecated_file_trigger_error', true )) {
 		if( !is_null($replacement) )
-			trigger_error( printf( __("%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead."), $file, $version, $replacement ) );
+			trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) );
 		else
-			trigger_error( printf( __("%1$s is <strong>deprecated</strong> since version %2$s with no alternative available."), $file, $version ) );
+			trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) );
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1670,9 +1670,9 @@ function _deprecated_function($function, $version, $replacement=null) {`
`1670`	`1670`	`// Allow plugin to filter the output error trigger`
`1671`	`1671`	`if( defined('WP_DEBUG') && ( true === WP_DEBUG ) && apply_filters( 'deprecated_function_trigger_error', true )) {`
`1672`	`1672`	`if( !is_null($replacement) )`
`1673`		`- trigger_error( printf( __("%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead."), $function, $version, $replacement ) );`
	`1673`	`+ trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );`
`1674`	`1674`	`else`
`1675`		`- trigger_error( printf( __("%1$s is <strong>deprecated</strong> since version %2$s with no alternative available."), $function, $version ) );`
	`1675`	`+ trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );`
`1676`	`1676`	`}`
`1677`	`1677`	`}`
`1678`	`1678`
`@@ -1705,9 +1705,9 @@ function _deprecated_file($file, $version, $replacement=null) {`
`1705`	`1705`	`// Allow plugin to filter the output error trigger`
`1706`	`1706`	`if( defined('WP_DEBUG') && ( true === WP_DEBUG ) && apply_filters( 'deprecated_file_trigger_error', true )) {`
`1707`	`1707`	`if( !is_null($replacement) )`
`1708`		`- trigger_error( printf( __("%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead."), $file, $version, $replacement ) );`
	`1708`	`+ trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) );`
`1709`	`1709`	`else`
`1710`		`- trigger_error( printf( __("%1$s is <strong>deprecated</strong> since version %2$s with no alternative available."), $file, $version ) );`
	`1710`	`+ trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) );`
`1711`	`1711`	`}`
`1712`	`1712`	`}`
`1713`	`1713`