]> granicus.if.org Git - php/commitdiff
Revert "Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10...
authorChristian Wenz <christian@wenz.org>
Tue, 9 Jun 2015 08:29:26 +0000 (10:29 +0200)
committerAnatol Belski <ab@php.net>
Wed, 10 Jun 2015 09:22:29 +0000 (11:22 +0200)
This reverts commit 4a05c81b85336b76d05017cc86372fbd04871e3f.

ext/standard/info.c

index d170f8a34559e87bfb3e8103af3093d3b6f93040..82b6bf8b48d40b9f3639d93979591412e6a8de7d 100644 (file)
@@ -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";