Filesystem API: Check PHP_OS_FAMILY instead of php_uname() in PclZip.

SergeyBiryukov · SergeyBiryukov · commit e2b0bfdc06b2 · 2024-12-12T22:21:21.000Z
The `php_uname()` function can be disabled on some hosts, in which case the call fails. The `PHP_OS_FAMILY` constant indicates the operating system family PHP was built for, and is available as of PHP 7.2.0. Reference: [https://www.php.net/manual/en/reserved.constants.php#constant.php-os-family PHP Manual: Predefined Constants: PHP_OS_FAMILY]. Follow-up to [6779], [57985], [58678], [58684]. Props daymobrew, costdev, desrosj. Fixes #57711. git-svn-id: https://develop.svn.wordpress.org/trunk@59506 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-admin/includes/class-pclzip.php b/src/wp-admin/includes/class-pclzip.php
@@ -5714,7 +5714,7 @@ function PclZipUtilOptionText($p_option)
   // --------------------------------------------------------------------------------
   function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
   {
-    if (stristr(php_uname(), 'windows')) {
+    if (PHP_OS_FAMILY == 'Windows') {
       // ----- Look for potential disk letter
       if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
           $p_path = substr($p_path, $v_position+1);

Original file line number	Diff line number	Diff line change
`@@ -5714,7 +5714,7 @@ function PclZipUtilOptionText($p_option)`
`5714`	`5714`	`// --------------------------------------------------------------------------------`
`5715`	`5715`	`function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)`
`5716`	`5716`	`{`
`5717`		`- if (stristr(php_uname(), 'windows')) {`
	`5717`	`+ if (PHP_OS_FAMILY == 'Windows') {`
`5718`	`5718`	`// ----- Look for potential disk letter`
`5719`	`5719`	`if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {`
`5720`	`5720`	`$p_path = substr($p_path, $v_position+1);`