Changeset 18637

Timestamp:

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

Author:

nacin

Message:

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

Location:

trunk

Files:

• wp-admin/includes/misc.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (3 diffs)

trunk/wp-admin/includes/misc.php

@@ -224 +224 @@
     $short_url = str_replace( 'http://', '', stripslashes( $url ));
     $short_url = str_replace( 'www.', '', $short_url );
-    if ('/' == substr( $short_url, -1 ))
-        $short_url = substr( $short_url, 0, -1 );
+    $short_url = untrailingslashit( $short_url );
     if ( strlen( $short_url ) > 35 )
-        $short_url = substr( $short_url, 0, 32 ).'...';
+        $short_url = substr( $short_url, 0, 32 ) . '...';
     return $short_url;
 }

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