Changeset 55354

Timestamp:

02/16/2023 10:11:32 PM (3 years ago)

Author:

azaozz

Message:

Filesystem API: Use trailingslashit( $path ) instead of $path . '/'. Fixes a warning when $path already ends with a slash.

Props: costdev, afragen, mukesh27.
Fixes: #57516.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-filesystem-direct.php (modified) (2 diffs)
• class-wp-filesystem-ftpext.php (modified) (1 diff)
• class-wp-filesystem-ftpsockets.php (modified) (2 diffs)
• class-wp-filesystem-ssh2.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-filesystem-direct.php

@@ -630 +630 @@
         }
 
-        $ret = array();
+        $path = trailingslashit( $path );
+        $ret  = array();
 
         while ( false !== ( $entry = $dir->read() ) ) {
@@ -648 +649 @@
             }
 
-            $struc['perms']       = $this->gethchmod( $path . '/' . $entry );
+            $struc['perms']       = $this->gethchmod( $path . $entry );
             $struc['permsn']      = $this->getnumchmodfromh( $struc['perms'] );
             $struc['number']      = false;
-            $struc['owner']       = $this->owner( $path . '/' . $entry );
-            $struc['group']       = $this->group( $path . '/' . $entry );
-            $struc['size']        = $this->size( $path . '/' . $entry );
-            $struc['lastmodunix'] = $this->mtime( $path . '/' . $entry );
+            $struc['owner']       = $this->owner( $path . $entry );
+            $struc['group']       = $this->group( $path . $entry );
+            $struc['size']        = $this->size( $path . $entry );
+            $struc['lastmodunix'] = $this->mtime( $path . $entry );
             $struc['lastmod']     = gmdate( 'M j', $struc['lastmodunix'] );
             $struc['time']        = gmdate( 'h:i:s', $struc['lastmodunix'] );
-            $struc['type']        = $this->is_dir( $path . '/' . $entry ) ? 'd' : 'f';
+            $struc['type']        = $this->is_dir( $path . $entry ) ? 'd' : 'f';
 
             if ( 'd' === $struc['type'] ) {
                 if ( $recursive ) {
-                    $struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
+                    $struc['files'] = $this->dirlist( $path . $struc['name'], $include_hidden, $recursive );
                 } else {
                     $struc['files'] = array();

trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php

@@ -762 +762 @@
         }
 
-        $ret = array();
+        $path = trailingslashit( $path );
+        $ret  = array();
 
         foreach ( (array) $dirlist as $struc ) {
             if ( 'd' === $struc['type'] ) {
                 if ( $recursive ) {
-                    $struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
+                    $struc['files'] = $this->dirlist( $path . $struc['name'], $include_hidden, $recursive );
                 } else {
                     $struc['files'] = array();

trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php

@@ -646 +646 @@
         }
 
-        $ret = array();
+        $path = trailingslashit( $path );
+        $ret  = array();
 
         foreach ( $list as $struc ) {
@@ -664 +665 @@
             if ( 'd' === $struc['type'] ) {
                 if ( $recursive ) {
-                    $struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
+                    $struc['files'] = $this->dirlist( $path . $struc['name'], $include_hidden, $recursive );
                 } else {
                     $struc['files'] = array();

trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php

@@ -775 +775 @@
         }
 
+        $path = trailingslashit( $path );
+
         while ( false !== ( $entry = $dir->read() ) ) {
             $struc         = array();
@@ -791 +793 @@
             }
 
-            $struc['perms']       = $this->gethchmod( $path . '/' . $entry );
+            $struc['perms']       = $this->gethchmod( $path . $entry );
             $struc['permsn']      = $this->getnumchmodfromh( $struc['perms'] );
             $struc['number']      = false;
-            $struc['owner']       = $this->owner( $path . '/' . $entry );
-            $struc['group']       = $this->group( $path . '/' . $entry );
-            $struc['size']        = $this->size( $path . '/' . $entry );
-            $struc['lastmodunix'] = $this->mtime( $path . '/' . $entry );
+            $struc['owner']       = $this->owner( $path . $entry );
+            $struc['group']       = $this->group( $path . $entry );
+            $struc['size']        = $this->size( $path . $entry );
+            $struc['lastmodunix'] = $this->mtime( $path . $entry );
             $struc['lastmod']     = gmdate( 'M j', $struc['lastmodunix'] );
             $struc['time']        = gmdate( 'h:i:s', $struc['lastmodunix'] );
-            $struc['type']        = $this->is_dir( $path . '/' . $entry ) ? 'd' : 'f';
+            $struc['type']        = $this->is_dir( $path . $entry ) ? 'd' : 'f';
 
             if ( 'd' === $struc['type'] ) {
                 if ( $recursive ) {
-                    $struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
+                    $struc['files'] = $this->dirlist( $path . $struc['name'], $include_hidden, $recursive );
                 } else {
                     $struc['files'] = array();