Changeset 18637 for trunk/wp-includes/ms-functions.php

Timestamp:

09/05/2011 04:53:19 PM (15 years ago)

Author:

nacin

Message:

Use untrailingslashit in url_shorten() and recurse_dirsize(). Remove unnecessary camelCase variables. see #18592.

File:

• trunk/wp-includes/ms-functions.php (modified) (3 diffs)

trunk/wp-includes/ms-functions.php

@@ -1522 +1522 @@
         $size = 0;
 
-        if ( substr( $directory, -1 ) == '/' )
-                $directory = substr($directory,0,-1);
+        $directory = untrailingslashit( $directory );
 
         if ( !file_exists($directory) || !is_dir( $directory ) || !is_readable( $directory ) )
@@ -1566 +1565 @@
                 $spaceAllowed = 10;     // Default space allowed is 10 MB
 
-        $dirName = BLOGUPLOADDIR;
-        $size = get_dirsize($dirName) / 1024 / 1024;
+        $size = get_dirsize( BLOGUPLOADDIR ) / 1024 / 1024;
 
         if ( ($spaceAllowed-$size) < 0 ) {
@@ -1648 +1646 @@
 
         $spaceAllowed = 1024 * 1024 * get_space_allowed();
-        $dirName = BLOGUPLOADDIR;
-        $dirsize = get_dirsize($dirName) ;
+        $dirsize = get_dirsize( BLOGUPLOADDIR );
         if ( $size > $spaceAllowed - $dirsize )
                 return $spaceAllowed - $dirsize; // remaining space