<?php _e('WordPress › Upgrade'); ?>

From 3a4570b0fc8b3d6339bef71d17d7701554e0bbf7 Mon Sep 17 00:00:00 2001 From: donncha 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/upgrade.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'wp-admin/upgrade.php') diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php index b08ffba..b8069b5 100644 --- a/wp-admin/upgrade.php +++ b/wp-admin/upgrade.php @@ -5,23 +5,20 @@ if (!file_exists('../wp-config.php')) require('../wp-config.php'); timer_start(); -require_once(ABSPATH . '/wp-admin/upgrade-functions.php'); +require_once(ABSPATH . 'wp-admin/includes/upgrade.php'); if (isset($_GET['step'])) $step = (int) $_GET['step']; else $step = 0; -@header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); +@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); ?> > <?php _e('WordPress › Upgrade'); ?> - - text_direction) ) : ?> - - +

@@ -39,7 +36,7 @@ switch($step) : ?>