Changeset 24440

Timestamp:

06/19/2013 08:12:48 AM (13 years ago)

Author:

nacin

Message:

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

Merges [24439] to the 3.5 branch.

props SergeyBiryukov.
fixes #23555.

File:

• branches/3.5/wp-includes/functions.php (modified) (1 diff)

branches/3.5/wp-includes/functions.php

@@ -2955 +2955 @@
         // Allow plugin to filter the output error trigger
         if ( WP_DEBUG && apply_filters( 'doing_it_wrong_trigger_error', true ) ) {
-                $version = is_null( $version ) ? '' : sprintf( __( '(This message was added in version %s.)' ), $version );
-                $message .= ' ' . __( 'Please see <a href="http://codex.wordpress.org/Debugging_in_WordPress">Debugging in WordPress</a> for more information.' );
-                trigger_error( sprintf( __( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s' ), $function, $message, $version ) );
+                if ( function_exists( '__' ) ) {
+                        $version = is_null( $version ) ? '' : sprintf( __( '(This message was added in version %s.)' ), $version );
+                        $message .= ' ' . __( 'Please see <a href="http://codex.wordpress.org/Debugging_in_WordPress">Debugging in WordPress</a> for more information.' );
+                        trigger_error( sprintf( __( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s' ), $function, $message, $version ) );
+                } else {
+                        $version = is_null( $version ) ? '' : sprintf( '(This message was added in version %s.)', $version );
+                        $message .= ' Please see <a href="http://codex.wordpress.org/Debugging_in_WordPress">Debugging in WordPress</a> for more information.';
+                        trigger_error( sprintf( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s', $function, $message, $version ) );
+                }
         }
 }