Changeset 43635

Timestamp:

09/12/2018 06:10:42 AM (6 years ago)

Author:

ocean90

Message:

I18N: In the POMO library, replace chr() calls for static values with their string representation.

Props ccismaru, ocean90.
Fixes #17128.

Location:

trunk/src/wp-includes/pomo

Files:

• entry.php (modified) (1 diff)
• mo.php (modified) (7 diffs)

trunk/src/wp-includes/pomo/entry.php

@@ -82 +82 @@
 
             // Prepend context and EOT, like in MO files
-            $key = ! $this->context ? $this->singular : $this->context . chr( 4 ) . $this->singular;
+            $key = ! $this->context ? $this->singular : $this->context . "\4" . $this->singular;
             // Standardize on \n line endings
             $key = str_replace( array( "\r\n", "\r" ), "\n", $key );

trunk/src/wp-includes/pomo/mo.php

@@ -125 +125 @@
             fwrite( $fh, pack( 'VV', 0, $current_addr ) );
             $current_addr++;
-            $originals_table = chr( 0 );
+            $originals_table = "\0";
 
             $reader = new POMO_Reader();
 
             foreach ( $entries as $entry ) {
-                $originals_table .= $this->export_original( $entry ) . chr( 0 );
+                $originals_table .= $this->export_original( $entry ) . "\0";
                 $length           = $reader->strlen( $this->export_original( $entry ) );
                 fwrite( $fh, pack( 'VV', $length, $current_addr ) );
@@ -139 +139 @@
             fwrite( $fh, pack( 'VV', $reader->strlen( $exported_headers ), $current_addr ) );
             $current_addr      += strlen( $exported_headers ) + 1;
-            $translations_table = $exported_headers . chr( 0 );
+            $translations_table = $exported_headers . "\0";
 
             foreach ( $entries as $entry ) {
-                $translations_table .= $this->export_translations( $entry ) . chr( 0 );
+                $translations_table .= $this->export_translations( $entry ) . "\0";
                 $length              = $reader->strlen( $this->export_translations( $entry ) );
                 fwrite( $fh, pack( 'VV', $length, $current_addr ) );
@@ -161 +161 @@
             $exported = $entry->singular;
             if ( $entry->is_plural ) {
-                $exported .= chr( 0 ) . $entry->plural;
+                $exported .= "\0" . $entry->plural;
             }
             if ( $entry->context ) {
-                $exported = $entry->context . chr( 4 ) . $exported;
+                $exported = $entry->context . "\4" . $exported;
             }
             return $exported;
@@ -175 +175 @@
         function export_translations( $entry ) {
             //TODO: warnings for control characters
-            return $entry->is_plural ? implode( chr( 0 ), $entry->translations ) : $entry->translations[0];
+            return $entry->is_plural ? implode( "\0", $entry->translations ) : $entry->translations[0];
         }
 
@@ -311 +311 @@
         function &make_entry( $original, $translation ) {
             $entry = new Translation_Entry();
-            // look for context
-            $parts = explode( chr( 4 ), $original );
+            // Look for context, separated by \4.
+            $parts = explode( "\4", $original );
             if ( isset( $parts[1] ) ) {
                 $original       = $parts[1];
@@ -318 +318 @@
             }
             // look for plural original
-            $parts           = explode( chr( 0 ), $original );
+            $parts           = explode( "\0", $original );
             $entry->singular = $parts[0];
             if ( isset( $parts[1] ) ) {
@@ -325 +325 @@
             }
             // plural translations are also separated by \0
-            $entry->translations = explode( chr( 0 ), $translation );
+            $entry->translations = explode( "\0", $translation );
             return $entry;
         }