From ab2ba0f49f3cca69e826684b13feedc2a15cf682 Mon Sep 17 00:00:00 2001
From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Thu, 2 Oct 2003 07:00:56 +0000
Subject: [PATCH] Fixed bug #25707 (html_entity_decode over-decodes &amp;lt;) #
 note: not MFH stuff

---
 ext/standard/html.c                      | 2 +-
 ext/standard/tests/strings/bug25707.phpt | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/ext/standard/html.c b/ext/standard/html.c
index 78ecb47295..e0f5f8abc4 100644
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -415,12 +415,12 @@ static const struct {
 	int entitylen;
 	int flags;
 } basic_entities[] = {
-	{ '&',	"&amp;",	5,	0 },
 	{ '"',	"&quot;",	6,	ENT_HTML_QUOTE_DOUBLE },
 	{ '\'',	"&#039;",	6,	ENT_HTML_QUOTE_SINGLE },
 	{ '\'',	"&#39;",	5,	ENT_HTML_QUOTE_SINGLE },
 	{ '<',	"&lt;",		4,	0 },
 	{ '>',	"&gt;",		4,	0 },
+	{ '&',	"&amp;",	5,	0 }, /* this should come last */
 	{ 0, NULL, 0, 0 }
 };
 	
diff --git a/ext/standard/tests/strings/bug25707.phpt b/ext/standard/tests/strings/bug25707.phpt
index 4954fb1ae5..75f03a7e2e 100644
--- a/ext/standard/tests/strings/bug25707.phpt
+++ b/ext/standard/tests/strings/bug25707.phpt
@@ -3,10 +3,6 @@ Bug #25707 (html_entity_decode over-decodes &amp;lt;)
 --FILE--
 <?php
 var_dump(html_entity_decode("&amp;lt;", ENT_COMPAT, 'ISO-8859-1'));
-var_dump(html_entity_decode("&amp;#38;", ENT_COMPAT, 'ISO-8859-1'));
-var_dump(html_entity_decode("&amp;#38;lt;", ENT_COMPAT, 'ISO-8859-1'));
 ?>
 --EXPECT--
 string(4) "&lt;"
-string(5) "&#38;"
-string(8) "&#38;lt;"
-- 
2.50.1