Changeset 6984

Timestamp:

02/22/08 17:46:03 (9 months ago)

Author:

ryan

Message:

Upload path fixes from tellyworth. see #5953

Files:

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

trunk/wp-includes/functions.php

@@ -1023 +1023 @@
-}
-
+// Test if a give filesystem path is absolute ('/foo/bar', 'c:\windows')
+function path_is_absolute( $path ) {
+    // this is definitive if true but fails if $path does not exist or contains a symbolic link
+    if ( realpath($path) == $path )
+        return true;
+
+    if ( strlen($path) == 0 || $path{0} == '.' )
+        return false;
+    
+    // windows allows absolute paths like this
+    if ( preg_match('#^[a-zA-Z]:\\\\#', $path) )
+        return true;
+
+    // a path starting with / or \ is absolute; anything else is relative
+    return (bool) preg_match('#^[/\\\\]#', $path);
+}
+
+// Join two filesystem paths together (e.g. 'give me $path relative to $base')
+function path_join( $base, $path ) {
+    if ( path_is_absolute($path) )
+        return $path;
+    
+    return rtrim($base, '/') . '/' . ltrim($path, '/');
+}
-
-// Returns an array containing the current upload directory's path and url, or an error message.
@@ -1029 +1053 @@
-    $upload_path = $dir = get_option( 'upload_path' );
-    
-
-
-
-
-
+
+
+
-
-    if ( !$url = get_option( 'upload_url_path' ) )
@@ -1046 +1068 @@
-    }
-
+    $subdir = '';
-    if ( get_option( 'uploads_use_yearmonth_folders' ) ) {
-        // Generate the yearly and monthly dirs
@@ -1052 +1075 @@
-        $y = substr( $time, 0, 4 );
-        $m = substr( $time, 5, 2 );
-
-
-
+
+
+
+
+
-
-    // Make sure we have an uploads dir
@@ -1062 +1087 @@
-    }
-
-   $uploads = array( 'path' => $dir, 'url' => $url
+$uploads = array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir
-    return apply_filters( 'upload_dir', $uploads );
-}