Fix incomplete entity reference work around. (#323)

alfsb · web-flow · commit 982980a58b8b · 2026-07-24T10:00:24.000-03:00
diff --git a/scripts/text-entities.php b/scripts/text-entities.php
@@ -329,7 +329,7 @@ function loadEntityGroup( string $path )
 {
     $path = realpath( $path );
     $text = file_get_contents( $path );
-    $text = str_replace( "&" , "&amp;" , $text );
+    $text = str_replace( '&' , '&amp;' , $text );
 
     $dom = new DOMDocument( '1.0' , 'utf8' );
     if ( ! $dom->loadXML( $text ) )
@@ -371,6 +371,7 @@ function loadEntityGroup( string $path )
         $text = "";
         foreach( $other->childNodes as $node )
             $text .= $other->saveXML( $node );
+        $text = str_replace( '&amp;' , '&' , $text );
 
         Entities::put( $path , $name , $text , $unique , $remove );
     }

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ function loadEntityGroup( string $path )`
`329`	`329`	`{`
`330`	`330`	`$path = realpath( $path );`
`331`	`331`	`$text = file_get_contents( $path );`
`332`		`- $text = str_replace( "&" , "&" , $text );`
	`332`	`+ $text = str_replace( '&' , '&' , $text );`
`333`	`333`
`334`	`334`	`$dom = new DOMDocument( '1.0' , 'utf8' );`
`335`	`335`	`if ( ! $dom->loadXML( $text ) )`
`@@ -371,6 +371,7 @@ function loadEntityGroup( string $path )`
`371`	`371`	`$text = "";`
`372`	`372`	`foreach( $other->childNodes as $node )`
`373`	`373`	`$text .= $other->saveXML( $node );`
	`374`	`+ $text = str_replace( '&' , '&' , $text );`
`374`	`375`
`375`	`376`	`Entities::put( $path , $name , $text , $unique , $remove );`
`376`	`377`	`}`