Changeset 24723

Timestamp:

07/17/2013 09:04:50 PM (11 years ago)

Author:

westi

Message:

Fall back to non-translated strings in _deprecated_*() if the translation function doesn't exist. This may be the case in sunrise, for example.

Fixes #24778 props SergeyBiryukov.

File:

• trunk/wp-includes/functions.php (modified) (3 diffs)

trunk/wp-includes/functions.php

@@ -2865 +2865 @@
     // Allow plugin to filter the output error trigger
     if ( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true ) ) {
-        if ( ! is_null($replacement) )
-            trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
-        else
-            trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+        if ( function_exists( '__' ) ) {
+            if ( ! is_null( $replacement ) )
+                trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
+            else
+                trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+        } else {
+            if ( ! is_null( $replacement ) )
+                trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $function, $version, $replacement ) );
+            else
+                trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+        }
     }
 }
@@ -2905 +2912 @@
     if ( WP_DEBUG && apply_filters( 'deprecated_file_trigger_error', true ) ) {
         $message = empty( $message ) ? '' : ' ' . $message;
-        if ( ! is_null( $replacement ) )
-            trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) . $message );
-        else
-            trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) . $message );
+        if ( function_exists( '__' ) ) {
+            if ( ! is_null( $replacement ) )
+                trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) . $message );
+            else
+                trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) . $message );
+        } else {
+            if ( ! is_null( $replacement ) )
+                trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $file, $version, $replacement ) . $message );
+            else
+                trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $file, $version ) . $message );
+        }
     }
 }
@@ -2949 +2963 @@
     // Allow plugin to filter the output error trigger
     if ( WP_DEBUG && apply_filters( 'deprecated_argument_trigger_error', true ) ) {
-        if ( ! is_null( $message ) )
-            trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $message ) );
-        else
-            trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+        if ( function_exists( '__' ) ) {
+            if ( ! is_null( $message ) )
+                trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $message ) );
+            else
+                trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+        } else {
+            if ( ! is_null( $message ) )
+                trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s', $function, $version, $message ) );
+            else
+                trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+        }
     }
 }