Ticket #23232: 23232.patch

wp-includes/pomo/mo.php

@@ -207 +207 @@
                         $translation = $reader->substr( $strings, $t['pos'], $t['length'] );
 
                         if ('' === $original) {
-                                $this->set_headers($this->make_headers($translation));
+                                $headers = $this->make_headers($translation);
+                                $this->set_headers($headers);
                         } else {
                                 $entry = &$this->make_entry($original, $translation);
                                 $this->entries[$entry->key()] = &$entry;

wp-includes/pomo/po.php

@@ -223 +223 @@
                         $res = $this->read_entry($f, $lineno);
                         if (!$res) break;
                         if ($res['entry']->singular == '') {
-                                $this->set_headers($this->make_headers($res['entry']->translations[0]));
+                                $headers = $this->make_headers($res['entry']->translations[0]);
+                                $this->set_headers($headers);
                         } else {
                                 $this->add_entry($res['entry']);
                         }