From 3a4570b0fc8b3d6339bef71d17d7701554e0bbf7 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Fri, 12 Oct 2007 16:21:15 +0000
Subject: Merge with WP 2.3 - testing use only! Move pluggable functions out of
 wpmu-functions and into pluggable.php, fixes #439

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1069 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-admin/upload.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'wp-admin/upload.php')
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 2aa3f66..bfbd9fc 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -1,7 +1,7 @@
 <?php
 require_once('admin.php');
 
-@header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
+@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
 
 if (!current_user_can('upload_files'))
 	wp_die(__('You do not have permission to upload files.'));
@@ -16,7 +16,7 @@ $post_id = (int) $post_id;
 if ( $action == 'edit' && !$ID )
 	wp_die(__("You are not allowed to be here"));
 
-require_once('upload-functions.php');
+require_once('includes/upload.php');
 if ( !$tab )
 	$tab = 'browse-all';
 
@@ -63,10 +63,7 @@ if ( 'inline' == $style ) : ?>
 <head>
 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
 <title><?php bloginfo('name') ?> &rsaquo; <?php _e('Uploads'); ?> &#8212; WordPress</title>
-<link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" />
-<?php if ( ('rtl' == $wp_locale->text_direction) ) : ?>
-<link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/rtl.css?version=<?php bloginfo('version'); ?>" type="text/css" />
-<?php endif; ?> 
+<?php wp_admin_css(); ?>
 <script type="text/javascript">
 //<![CDATA[
 function addLoadEvent(func) {if ( typeof wpOnload!='function'){wpOnload=func;}else{ var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}}
-- 
cgit 

