Ticket #28162: 28162.4.patch

src/wp-admin/includes/image.php

@@ -289 +289 @@
                         if ( ! empty( $iptc['2#120'][0] ) ) { // description / legacy caption
                                 $caption = trim( $iptc['2#120'][0] );
                                 if ( empty( $meta['title'] ) ) {
+                                        mbstring_binary_safe_encoding();
                                         // Assume the title is stored in 2:120 if it's short.
                                         if ( strlen( $caption ) < 80 )
                                                 $meta['title'] = $caption;
                                         else
                                                 $meta['caption'] = $caption;
+                                        reset_mbstring_encoding();
                                 } elseif ( $caption != $meta['title'] ) {
                                         $meta['caption'] = $caption;
                                 }
@@ -326 +328 @@
                         $meta['title'] = trim( $exif['Title'] );
 
                 if ( ! empty( $exif['ImageDescription'] ) ) {
+                        mbstring_binary_safe_encoding();
                         if ( empty( $meta['title'] ) && strlen( $exif['ImageDescription'] ) < 80 ) {
                                 // Assume the title is stored in ImageDescription
                                 $meta['title'] = trim( $exif['ImageDescription'] );
@@ -334 +337 @@
                         } elseif ( trim( $exif['ImageDescription'] ) != $meta['title'] ) {
                                 $meta['caption'] = trim( $exif['ImageDescription'] );
                         }
+                        reset_mbstring_encoding();
                 } elseif ( ! empty( $exif['Comments'] ) && trim( $exif['Comments'] ) != $meta['title'] ) {
                         $meta['caption'] = trim( $exif['Comments'] );
                 }

src/wp-includes/formatting.php

@@ -410 +410 @@
  * @return bool True if $str fits a UTF-8 model, false otherwise.
  */
 function seems_utf8($str) {
+        mbstring_binary_safe_encoding();
         $length = strlen($str);
+        reset_mbstring_encoding();
         for ($i=0; $i < $length; $i++) {
                 $c = ord($str[$i]);
                 if ($c < 0x80) $n = 0; # 0bbbbbbb
@@ -634 +636 @@
         $num_octets = 1;
         $unicode_length = 0;
 
+        mbstring_binary_safe_encoding();
         $string_length = strlen( $utf8_string );
+        reset_mbstring_encoding();
+
         for ($i = 0; $i < $string_length; $i++ ) {
 
                 $value = ord( $utf8_string[ $i ] );

src/wp-includes/pomo/mo.php

@@ -75 +75 @@
                 $current_addr++;
                 $originals_table = chr(0);
 
+                $reader = new POMO_Reader();
+
                 foreach($entries as $entry) {
                         $originals_table .= $this->export_original($entry) . chr(0);
-                        $length = strlen($this->export_original($entry));
+                        $length = $reader->strlen($this->export_original($entry));
                         fwrite($fh, pack('VV', $length, $current_addr));
                         $current_addr += $length + 1; // account for the NULL byte after
                 }
 
                 $exported_headers = $this->export_headers();
-                fwrite($fh, pack('VV', strlen($exported_headers), $current_addr));
+                fwrite($fh, pack('VV', $reader->strlen($exported_headers), $current_addr));
                 $current_addr += strlen($exported_headers) + 1;
                 $translations_table = $exported_headers . chr(0);
 
                 foreach($entries as $entry) {
                         $translations_table .= $this->export_translations($entry) . chr(0);
-                        $length = strlen($this->export_translations($entry));
+                        $length = $reader->strlen($this->export_translations($entry));
                         fwrite($fh, pack('VV', $length, $current_addr));
                         $current_addr += $length + 1;
                 }