changed str_replace to preg_replace

omeka · Mar 20, 2014 · e433ca6 · e433ca6
1 parent 8aa5508
commit e433ca6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/application/libraries/Omeka/Output/OmekaXml/AbstractOmekaXml.php b/application/libraries/Omeka/Output/OmekaXml/AbstractOmekaXml.php
@@ -253,9 +253,10 @@ protected function _buildElementSetContainerForRecord(Omeka_Record_AbstractRecor
                 $elementTextContainerElement = $this->_createElement('elementTextContainer');
                 foreach ($element['elementTexts'] as $elementTextId => $elementText) {
                     // elementText
-                    $elementText['text'] = str_replace("\f","&#xc;",$elementText['text']);
                     $elementTextElement = $this->_createElement('elementText', null, $elementTextId);
-                    $textElement = $this->_createElement('text', $elementText['text'], null, $elementTextElement);
+                    // Replace invalid control characters
+                    $text = preg_replace('#[\x00-\x08\x0B\x0C\x0E-\x1F]#', "\xef\xbf\xbd", $elementText['text']);
+                    $textElement = $this->_createElement('text', $text, null, $elementTextElement);
                     $elementTextContainerElement->appendChild($elementTextElement);
                 }
                 $elementElement->appendChild($elementTextContainerElement);