# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /Applications/MAMP/htdocs/WordPressCore/trunk/wp-includes
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: functions.php
--- functions.php Base (BASE)
+++ functions.php Locally Modified (Based On LOCAL)
@@ -2221,21 +2221,21 @@
 	$upload_path = get_option( 'upload_path' );
 	$upload_path = trim($upload_path);
 	$main_override = is_multisite() && defined( 'MULTISITE' ) && is_main_site();
-	if ( empty($upload_path) ) {
-		$dir = WP_CONTENT_DIR . '/uploads';
-	} else {
+        
+        // If WP_UPLOADS_DIR is defined, use it, otherwise assum the default for now.
+        $dir = ( defined('WP_UPLOADS_DIR') ) ? WP_UPLOADS_DIR : WP_CONTENT_DIR . '/uploads'; ; 
+
+        if (!empty($upload_path)) {
 		$dir = $upload_path;
-		if ( 'wp-content/uploads' == $upload_path ) {
-			$dir = WP_CONTENT_DIR . '/uploads';
-		} elseif ( 0 !== strpos($dir, ABSPATH) ) {
+            if ('wp-content/uploads' != $upload_path || 0 !== strpos($dir, ABSPATH)) {
 			// $dir is absolute, $upload_path is (maybe) relative to ABSPATH
-			$dir = path_join( ABSPATH, $dir );
+                $dir = path_join(ABSPATH, $dir);
 		}
 	}
 
 	if ( !$url = get_option( 'upload_url_path' ) ) {
 		if ( empty($upload_path) || ( 'wp-content/uploads' == $upload_path ) || ( $upload_path == $dir ) )
-			$url = WP_CONTENT_URL . '/uploads';
+			$url = ( defined('WP_UPLOADS_URL') ) ? WP_UPLOADS_DIR : WP_CONTENT_URL . '/uploads';
 		else
 			$url = trailingslashit( $siteurl ) . $upload_path;
 	}