# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /Applications/MAMP/htdocs/WordPressCore/trunk
# 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: wp-includes/default-constants.php
--- wp-includes/default-constants.php Base (BASE)
+++ wp-includes/default-constants.php Locally Modified (Based On LOCAL)
@@ -298,4 +298,27 @@
 
 }
 
+/**
+ * Defines uploads directory WordPress constants
+ * 
+ * @since 3.3
+ */
+function wp_uploads_constants() {
+        /**
+         * Allows for the uploads directory to be moved from the default location.
+         * 
+         * @since 3.3
+         */
+        if ( !defined('WP_UPLOADS_DIR') )
+                define('WP_UPLOADS_DIR', WP_CONTENT_DIR . '/uploads');
+
+        /**
+         * Allows for the uploads directory to be moved from the default location.
+         * 
+         * @since 3.3
+         */
+        if ( !defined('WP_UPLOADS_URL') )
+                define('WP_UPLOADS_URL', WP_CONTENT_URL . '/uploads');
+}
+
 ?>
Index: wp-includes/functions.php
--- wp-includes/functions.php Base (BASE)
+++ wp-includes/functions.php Locally Modified (Based On LOCAL)
@@ -2220,22 +2220,20 @@
 	$siteurl = get_option( 'siteurl' );
 	$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 {
+        $main_override = is_multisite() && defined('MULTISITE') && is_main_site();
+        $dir = WP_UPLOADS_DIR;
+
+        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 = WP_UPLOADS_URL;
 		else
 			$url = trailingslashit( $siteurl ) . $upload_path;
 	}
Index: wp-settings.php
--- wp-settings.php Base (BASE)
+++ wp-settings.php Locally Modified (Based On LOCAL)
@@ -153,6 +153,9 @@
 // Define must-use plugin directory constants, which may be overridden in the sunrise.php drop-in.
 wp_plugin_directory_constants( );
 
+//Define the uploads directory constants - must be after wp_plugin_directory_constants() because it defines WP_CONTENT_URL
+wp_uploads_constants();
+
 // Load must-use plugins.
 foreach ( wp_get_mu_plugins() as $mu_plugin ) {
 	include_once( $mu_plugin );