Keep namespace clean.

Foml.php

@@ -1,13 +1,5 @@
 <?php
 
-// PHP 5.4 and beyond supports XML via htmlentities, but for now we will escape manually. 
-// courtesy of 
-// http://stackoverflow.com/questions/3957360/generating-xml-document-in-php-escape-characters
-function xmlentities($string) {
-    return str_replace(array("&", "<", ">", "\"", "'"),
-                       array("&amp;", "&lt;", "&gt;", "&quot;", "&apos;"), $string);
-}
-
 /*
  * If you are NOT using a class autoloader 
  * you should require_once 'FomlConfig.php'
@@ -25,6 +17,15 @@ class Foml
     static $pdfMimeType = "application/pdf";
     static $defaultNamespace = "fo";
 
+    // PHP 5.4 and beyond supports XML via htmlentities, but for now we will escape manually. 
+    // courtesy of 
+    // http://stackoverflow.com/questions/3957360/generating-xml-document-in-php-escape-characters
+    static function XmlEntities($string) {
+        return str_replace(array("&", "<", ">", "\"", "'"),
+                           array("&amp;", "&lt;", "&gt;", "&quot;", "&apos;"),
+                           $string);
+    }
+
     static function GeneratePhp($Template)
     {
         $fomlParser = new FomlParser();

FomlEvalNode.php

@@ -15,9 +15,7 @@ function RenderPrefix()
         print "print ";
         // revisit - would be nice to be able to turn off htmlentities
         if ($this->xmlEscape) {
-            // This depends on PHP 5.4 or later
-            //print "htmlentities({$this->code},ENT_XML1)";
-            print "xmlentities({$this->code})";
+            print "Foml::XmlEntities({$this->code})";
         } else {
             print $this->code;
         }