Merge branch 'develop'

fchris82 · Jan 4, 2017 · 91b30d3 · 91b30d3
2 parents 5a5d05f + 678c09e
commit 91b30d3
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/Translation/Dumper/XliffDumper.php b/Translation/Dumper/XliffDumper.php
@@ -191,7 +191,12 @@ public function dump(MessageCatalogue $catalogue, $domain = 'messages', $filePat
 
                 if ($message->hasNotes()) {
                     foreach ($message->getNotes() as $note) {
-                        $noteNode = $unit->appendChild($doc->createElement('note', $note['text']));
+                        $noteNode = $unit->appendChild($doc->createElement('note'));
+                        if (preg_match('/[<>&]/', $note['text'])) {
+                            $noteNode->appendChild($doc->createCDATASection($note['text']));
+                        } else {
+                            $noteNode->appendChild($doc->createTextNode($note['text']));
+                        }
                         if (isset($note['from'])) {
                             $noteNode->setAttribute('from', $note['from']);
                         }
@@ -234,7 +239,12 @@ public function dump(MessageCatalogue $catalogue, $domain = 'messages', $filePat
             }
 
             if ($meaning = $message->getMeaning()) {
-                $unit->appendChild($doc->createElement('note', $meaning));
+                $unit->appendChild($meaningNode = $doc->createElement('note'));
+                if (preg_match('/[<>&]/', $meaning)) {
+                    $meaningNode->appendChild($doc->createCDATASection($meaning));
+                } else {
+                    $meaningNode->appendChild($doc->createTextNode($meaning));
+                }
             }
         }