Ticket #21319: 21319.diff

wp-includes/l10n.php

@@ -65 +65 @@
  * @return string Translated text
  */
 function translate( $text, $domain = 'default' ) {
-        $translations = &get_translations_for_domain( $domain );
+        $translations = get_translations_for_domain( $domain );
         return apply_filters( 'gettext', $translations->translate( $text ), $text, $domain );
 }
 
@@ -78 +78 @@
 }
 
 function translate_with_gettext_context( $text, $context, $domain = 'default' ) {
-        $translations = &get_translations_for_domain( $domain );
+        $translations = get_translations_for_domain( $domain );
         return apply_filters( 'gettext_with_context', $translations->translate( $text, $context ), $text, $context, $domain );
 }
 
@@ -236 +236 @@
  * @return string Either $single or $plural translated text
  */
 function _n( $single, $plural, $number, $domain = 'default' ) {
-        $translations = &get_translations_for_domain( $domain );
+        $translations = get_translations_for_domain( $domain );
         $translation = $translations->translate_plural( $single, $plural, $number );
         return apply_filters( 'ngettext', $translation, $single, $plural, $number, $domain );
 }
@@ -249 +249 @@
  *
  */
 function _nx($single, $plural, $number, $context, $domain = 'default') {
-        $translations = &get_translations_for_domain( $domain );
+        $translations = get_translations_for_domain( $domain );
         $translation = $translations->translate_plural( $single, $plural, $number, $context );
         return apply_filters( 'ngettext_with_context', $translation, $single, $plural, $number, $context, $domain );
 }
@@ -493 +493 @@
  * @param string $domain
  * @return object A Translation instance
  */
-function &get_translations_for_domain( $domain ) {
+function get_translations_for_domain( $domain ) {
         global $l10n;
-        if ( !isset( $l10n[$domain] ) ) {
-                $l10n[$domain] = new NOOP_Translations;
-        }
-        return $l10n[$domain];
+        if ( isset( $l10n[ $domain ] ) )
+                return $l10n[ $domain ];
+
+        static $noop_translations;
+        if ( ! $noop_translations )
+                $noop_translations = new NOOP_Translations;
+        return $noop_translations;
 }
 
 /**