From 82e5260104021076402430b1fabc8af99860104c Mon Sep 17 00:00:00 2001 From: Christian Wenz Date: Tue, 9 Jun 2015 10:29:26 +0200 Subject: [PATCH] Revert "Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"" This reverts commit 4a05c81b85336b76d05017cc86372fbd04871e3f. --- ext/standard/info.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/ext/standard/info.c b/ext/standard/info.c index d170f8a345..82b6bf8b48 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -404,25 +404,10 @@ char* php_get_windows_name() sub = "Enterprise Edition"; break; case PRODUCT_BUSINESS: - if ((osvi.dwMajorVersion > 6) || (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion > 0)) { - sub = "Professional Edition"; - } else { - sub = "Business Edition"; - } - break; - case PRODUCT_BUSINESS_N: - if ((osvi.dwMajorVersion > 6) || (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion > 0)) { - sub = "Professional N Edition"; - } else { - sub = "Business N Edition"; - } + sub = "Business Edition"; break; case PRODUCT_STARTER: - if ((osvi.dwMajorVersion > 6) || (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion > 0)) { - sub = "Starter N Edition"; - } else { - sub = "Starter Edition"; - } + sub = "Starter Edition"; break; case PRODUCT_CLUSTER_SERVER: sub = "Cluster Server Edition"; -- 2.40.0