Fixed upload path.

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@274 7be80a69-a1ef-0310-a953-fb0f7c49ff36

3 files changed, 9 insertions, 5 deletions

diff --git a/wp-inst/wp-admin/upload.php b/wp-inst/wp-admin/upload.php
index 2fede3a..86d1c09 100644
--- a/wp-inst/wp-admin/upload.php
+++ b/wp-inst/wp-admin/upload.php
@@ -168,11 +168,11 @@ case 'upload':
     <input type="hidden" name="imgdesc" value="<?php echo $imgdesc;?>" />
     <input type="submit" name="submit" value="<?php _e('Overwrite') ?>" class="search" />
     </form>
-</div>
-<?php 
+    </div>
+    <?php 
 
-require('admin-footer.php');
-die();
+	require('admin-footer.php');
+	die();
 
     }
 
diff --git a/wp-inst/wp-content/blogs b/wp-inst/wp-content/blogs
index 20bad52..e6cdd4a 100644
--- a/wp-inst/wp-content/blogs
+++ b/wp-inst/wp-content/blogs
@@ -1,7 +1,10 @@
 <?php
 define( "BLOGDEFINITION", true );
 require_once( "../wp-config.php" );
-$file = ABSPATH . "wp-content/blogs.dir/" . $blog_id . $_SERVER[ 'REQUEST_URI' ];
+$file = substr( $_SERVER[ 'REQUEST_URI' ], strrpos( $_SERVER[ 'REQUEST_URI' ], '/' ) );
+
+$file = ABSPATH . "wp-content/blogs.dir/" . $blog_id . '/files/' . $file;
+
 if( is_file( $file ) ) {
 	$etag = md5( $file . filemtime( $file ) );
 	$lastModified = date( "D, j M Y H:i:s ", filemtime( $file ) ) . "GMT";
diff --git a/wp-inst/wp-includes/wpmu-functions.php b/wp-inst/wp-includes/wpmu-functions.php
index 9f0b5c8..d77c7f3 100644
--- a/wp-inst/wp-includes/wpmu-functions.php
+++ b/wp-inst/wp-includes/wpmu-functions.php
@@ -181,6 +181,7 @@ function createBlog( $domain, $path, $username, $weblog_title, $admin_email, $si
     // fix url.
     update_option('siteurl', $url);
     update_option('home', $url);
+    update_option('fileupload_url', $url . "files" );
 
     $wpdb->query("UPDATE $wpdb->options SET option_value = '".$weblog_title."' WHERE option_name = 'blogname'");
     $wpdb->query("UPDATE $wpdb->options SET option_value = '".$admin_email."' WHERE option_name = 'admin_email'");