Tue Oct 19 03:03:08 UTC 2004

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26500/wp-admin

Modified Files:
	admin-functions.php admin-header.php categories.php 
	edit-comments.php edit-pages.php edit.php link-add.php 
	link-categories.php link-import.php link-manager.php menu.php 
	moderation.php options-discussion.php options-general.php 
	options-head.php options-misc.php options-permalink.php 
	options-reading.php options-writing.php options.php 
	plugins.php post.php profile.php templates.php 
	theme-editor.php themes.php user-edit.php users.php 
Added Files:
	admin.php menu-header.php 
Log Message:
Split admin-header.php into admin.php and admin-header.php.  Split menu.php into menu-header.php and menu.php.  Add plugin admin page support.

Index: link-add.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/link-add.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** link-add.php	22 Aug 2004 23:24:50 -0000	1.18
--- link-add.php	19 Oct 2004 03:03:03 -0000	1.19
***************
*** 1,4 ****
  <?php
! require_once('../wp-includes/wp-l10n.php');

  $title = 'Add Link';
--- 1,4 ----
  <?php
! require_once('admin.php');

  $title = 'Add Link';
***************
*** 23,43 ****
  }

! function add_magic_quotes($array) {
!     foreach ($array as $k => $v) {
!         if (is_array($v)) {
!             $array[$k] = add_magic_quotes($v);
!         } else {
!             $array[$k] = addslashes($v);
!         }
!     }
!     return $array;
! }
! if (!get_magic_quotes_gpc()) {
!     $_GET    = add_magic_quotes($_GET);
!     $_POST   = add_magic_quotes($_POST);
!     $_COOKIE = add_magic_quotes($_COOKIE);
! }
! 
! $wpvarstoreset = array('action','standalone','cat_id', 'linkurl', 'name', 'image',
                         'description', 'visible', 'target', 'category', 'link_id',
                         'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel',
--- 23,27 ----
  }

! $wpvarstoreset = array('action', 'cat_id', 'linkurl', 'name', 'image',
                         'description', 'visible', 'target', 'category', 'link_id',
                         'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel',

Index: users.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/users.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** users.php	4 Oct 2004 07:44:04 -0000	1.38
--- users.php	19 Oct 2004 03:03:06 -0000	1.39
***************
*** 1,4 ****
  <?php
! require_once('../wp-includes/wp-l10n.php');

  $title = __('Users');
--- 1,4 ----
  <?php
! require_once('admin.php');

  $title = __('Users');
***************
*** 23,29 ****
  switch ($action) {
  case 'adduser':
- 	$standalone = 1;
- 	require_once('admin-header.php');
- 
  	check_admin_referer();

--- 23,26 ----
***************
*** 101,108 ****

  case 'promote':
- 
- 	$standalone = 1;
- 	require_once('admin-header.php');
- 
  	check_admin_referer();

--- 98,101 ----
***************
*** 136,142 ****
  case 'delete':

- 	$standalone = 1;
- 	require_once('admin-header.php');
- 
  	check_admin_referer();

--- 129,132 ----
***************
*** 177,181 ****
  default:

- 	$standalone = 0;
  	include ('admin-header.php');
  	?>
--- 167,170 ----

Index: options-discussion.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-discussion.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** options-discussion.php	18 Oct 2004 04:50:07 -0000	1.23
--- options-discussion.php	19 Oct 2004 03:03:04 -0000	1.24
***************
*** 1,7 ****
  <?php
! require_once('../wp-includes/wp-l10n.php');

  $title = __('Discussion Options');
! include('options-head.php');

  if ($action == 'retrospam') {
--- 1,9 ----
  <?php
! require_once('admin.php');

  $title = __('Discussion Options');
! $parent_file = 'options-general.php';
! 
! include('admin-header.php');

  if ($action == 'retrospam') {

Index: options-reading.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-reading.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** options-reading.php	18 Oct 2004 04:50:07 -0000	1.18
--- options-reading.php	19 Oct 2004 03:03:05 -0000	1.19
***************
*** 1,7 ****
  <?php
! require_once('../wp-includes/wp-l10n.php');

  $title = __('Reading Options');
! include('options-head.php');
  ?>

--- 1,9 ----
  <?php
! require_once('admin.php');

  $title = __('Reading Options');
! $parent_file = 'options-general.php';
! 
! include('admin-header.php');
  ?>

Index: link-categories.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/link-categories.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** link-categories.php	5 Sep 2004 00:24:26 -0000	1.16
--- link-categories.php	19 Oct 2004 03:03:04 -0000	1.17
***************
*** 2,11 ****
  // Links
  // Copyright (C) 2002, 2003 Mike Little -- mike at zed1.com
! require_once('../wp-includes/wp-l10n.php');
  $title = __('Link Categories');
  $this_file='link-categories.php';
  $parent_file = 'link-manager.php';

! $wpvarstoreset = array('action','standalone','cat', 'auto_toggle');
  for ($i=0; $i<count($wpvarstoreset); $i += 1) {
      $wpvar = $wpvarstoreset[$i];
--- 2,11 ----
  // Links
  // Copyright (C) 2002, 2003 Mike Little -- mike at zed1.com
! require_once('admin.php');
  $title = __('Link Categories');
  $this_file='link-categories.php';
  $parent_file = 'link-manager.php';

! $wpvarstoreset = array('action', 'cat', 'auto_toggle');
  for ($i=0; $i<count($wpvarstoreset); $i += 1) {
      $wpvar = $wpvarstoreset[$i];
***************
*** 26,32 ****
    case 'addcat':
    {
-       $standalone = 1;
-       include_once('admin-header.php');
- 
        if ($user_level < 5)
            die (__("Cheatin' uh ?"));
--- 26,29 ----
***************
*** 83,89 ****
    case 'Delete':
    {
-     $standalone = 1;
-     include_once('admin-header.php');
- 
      $cat_id = $_GET['cat_id'];
      $cat_name=get_linkcatname($cat_id);
--- 80,83 ----
***************
*** 205,211 ****
    case "editedcat":
    {
-     $standalone = 1;
-     include_once("./admin-header.php");
- 
      if ($user_level < 5)
        die (__("Cheatin' uh ?"));
--- 199,202 ----
***************
*** 279,284 ****
    default:
    {
!     $standalone=0;
!     include_once ("./admin-header.php");
      if ($user_level < 5) {
        die(__("You have do not have sufficient permissions to edit the link categories for this blog. :)"));
--- 270,274 ----
    default:
    {
!     include_once ("admin-header.php");
      if ($user_level < 5) {
        die(__("You have do not have sufficient permissions to edit the link categories for this blog. :)"));

Index: edit-pages.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/edit-pages.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** edit-pages.php	6 Oct 2004 05:11:09 -0000	1.5
--- edit-pages.php	19 Oct 2004 03:03:03 -0000	1.6
***************
*** 1,5 ****
  <?php
! require_once('../wp-includes/wp-l10n.php');
! 
  $title = __('Pages');
  $parent_file = 'edit.php';
--- 1,4 ----
  <?php
! require_once('admin.php');
  $title = __('Pages');
  $parent_file = 'edit.php';

Index: options-writing.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-writing.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** options-writing.php	18 Oct 2004 04:50:08 -0000	1.25
--- options-writing.php	19 Oct 2004 03:03:05 -0000	1.26
***************
*** 1,7 ****
  <?php
! require_once('../wp-includes/wp-l10n.php');

  $title = __('Writing Options');
! include('./options-head.php');
  ?>

--- 1,9 ----
  <?php
! require_once('admin.php');

  $title = __('Writing Options');
! $parent_file = 'options-general.php';
! 
! include('admin-header.php');
  ?>

Index: theme-editor.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/theme-editor.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** theme-editor.php	22 Sep 2004 06:33:54 -0000	1.3
--- theme-editor.php	19 Oct 2004 03:03:06 -0000	1.4
***************
*** 1,19 ****
  <?php
! require_once('../wp-includes/wp-l10n.php');

  $title = __("Template &amp; file editing");
  $parent_file = 'themes.php';

- function add_magic_quotes($array) {
- 	foreach ($array as $k => $v) {
- 		if (is_array($v)) {
- 			$array[$k] = add_magic_quotes($v);
- 		} else {
- 			$array[$k] = addslashes($v);
- 		}
- 	}
- 	return $array;
- } 
- 
  function validate_file($file) {
  	if ('..' == substr($file,0,2))
--- 1,8 ----
  <?php
! require_once('admin.php');

  $title = __("Template &amp; file editing");
  $parent_file = 'themes.php';

  function validate_file($file) {
  	if ('..' == substr($file,0,2))
***************
*** 32,42 ****
  }

! if (!get_magic_quotes_gpc()) {
! 	$_GET    = add_magic_quotes($_GET);
! 	$_POST   = add_magic_quotes($_POST);
! 	$_COOKIE = add_magic_quotes($_COOKIE);
! }
! 
! $wpvarstoreset = array('action','standalone','redirect','profile','error','warning','a','file', 'theme');
  for ($i=0; $i<count($wpvarstoreset); $i += 1) {
  	$wpvar = $wpvarstoreset[$i];
--- 21,25 ----
  }

! $wpvarstoreset = array('action','redirect','profile','error','warning','a','file', 'theme');
  for ($i=0; $i<count($wpvarstoreset); $i += 1) {
  	$wpvar = $wpvarstoreset[$i];
***************
*** 58,64 ****
  case 'update':

- 	$standalone = 1;
- 	require_once("admin-header.php");
- 
  	if ($user_level < 5) {
  		die(__('<p>You have do not have sufficient permissions to edit templates for this blog.</p>'));
--- 41,44 ----

Index: options-general.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-general.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** options-general.php	18 Oct 2004 04:50:07 -0000	1.30
--- options-general.php	19 Oct 2004 03:03:04 -0000	1.31
***************
*** 1,8 ****
  <?php
! require_once('../wp-includes/wp-l10n.php');

  $title = __('General Options');

! include('options-head.php');
  ?>

--- 1,9 ----
  <?php
! require_once('admin.php');

  $title = __('General Options');
+ $parent_file = 'options-general.php';

! include('admin-header.php');
  ?>

Index: options-misc.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-misc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** options-misc.php	18 Oct 2004 04:50:07 -0000	1.15
--- options-misc.php	19 Oct 2004 03:03:04 -0000	1.16
***************
*** 1,7 ****
  <?php
! require_once('../wp-includes/wp-l10n.php');

  $title = __('Miscellaneous Options');
! include('options-head.php');
  ?>

--- 1,10 ----
  <?php
! require_once('admin.php');

  $title = __('Miscellaneous Options');
! $parent_file = 'options-general.php';
! 
! include('admin-header.php');
! 
  ?>

Index: templates.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/templates.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** templates.php	22 Sep 2004 06:33:54 -0000	1.26
--- templates.php	19 Oct 2004 03:03:06 -0000	1.27
***************
*** 1,19 ****
  <?php
! require_once('../wp-includes/wp-l10n.php');
! 
  $title = __('Template &amp; file editing');
  $parent_file = 	'themes.php';

- function add_magic_quotes($array) {
- 	foreach ($array as $k => $v) {
- 		if (is_array($v)) {
- 			$array[$k] = add_magic_quotes($v);
- 		} else {
- 			$array[$k] = addslashes($v);
- 		}
- 	}
- 	return $array;
- } 
- 
  function validate_file($file) {
  	if ('..' == substr($file,0,2))
--- 1,7 ----
  <?php
! require_once('admin.php');
  $title = __('Template &amp; file editing');
  $parent_file = 	'themes.php';

  function validate_file($file) {
  	if ('..' == substr($file,0,2))
***************
*** 32,42 ****
  }

! if (!get_magic_quotes_gpc()) {
! 	$_GET    = add_magic_quotes($_GET);
! 	$_POST   = add_magic_quotes($_POST);
! 	$_COOKIE = add_magic_quotes($_COOKIE);
! }
! 
! $wpvarstoreset = array('action','standalone','redirect','profile','error','warning','a','file');
  for ($i=0; $i<count($wpvarstoreset); $i += 1) {
  	$wpvar = $wpvarstoreset[$i];
--- 20,24 ----
  }

! $wpvarstoreset = array('action','redirect','profile','error','warning','a','file');
  for ($i=0; $i<count($wpvarstoreset); $i += 1) {
  	$wpvar = $wpvarstoreset[$i];
***************
*** 58,64 ****
  case 'update':

- 	$standalone = 1;
- 	require_once('./admin-header.php');
- 
  	if ($user_level < 5) {
  		die(__('<p>You have do not have sufficient permissions to edit templates for this blog.</p>'));
--- 40,43 ----

Index: options.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** options.php	5 Oct 2004 16:22:30 -0000	1.34
--- options.php	19 Oct 2004 03:03:05 -0000	1.35
***************
*** 1,4 ****
  <?php
! require_once('../wp-includes/wp-l10n.php');

  $title = __('Options');
--- 1,4 ----
  <?php
! require_once('admin.php');

  $title = __('Options');
***************
*** 6,27 ****
  $parent_file = 'options-general.php';

! function add_magic_quotes($array) {
! 	foreach ($array as $k => $v) {
! 		if (is_array($v)) {
! 			$array[$k] = add_magic_quotes($v);
! 		} else {
! 			$array[$k] = addslashes($v);
! 		}
! 	}
! 	return $array;
! }
! 
! if (!get_magic_quotes_gpc()) {
! 	$_GET    = add_magic_quotes($_GET);
! 	$_POST   = add_magic_quotes($_POST);
! 	$_COOKIE = add_magic_quotes($_COOKIE);
! }
! 
! $wpvarstoreset = array('action','standalone');
  for ($i=0; $i<count($wpvarstoreset); $i += 1) {
  	$wpvar = $wpvarstoreset[$i];
--- 6,10 ----
  $parent_file = 'options-general.php';

! $wpvarstoreset = array('action');
  for ($i=0; $i<count($wpvarstoreset); $i += 1) {
  	$wpvar = $wpvarstoreset[$i];
***************
*** 42,47 ****

  case 'update':
- 	$standalone = 1;
- 	include_once('./admin-header.php');
      $any_changed = 0;

--- 25,28 ----
***************
*** 92,103 ****

  default:
! 	$standalone = 0;
! 	include_once('./admin-header.php');
! 	if ($user_level <= 6) {
! 		die(__("You have do not have sufficient permissions to edit the options for this blog."));
! 	}
! ?>
! 
! <?php include('options-head.php'); ?>

  <div class="wrap">
--- 73,77 ----

  default:
! 	include('admin-header.php'); ?>

  <div class="wrap">

Index: admin-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/admin-functions.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** admin-functions.php	18 Oct 2004 04:50:07 -0000	1.51
--- admin-functions.php	19 Oct 2004 03:03:03 -0000	1.52
***************
*** 662,669 ****
  }

! function add_options_menu($title, $access_level, $file) {
  	global $submenu;
! 	
! 	$submenu['options-general.php'][] = array($title, $access_level, $file);
  }

--- 662,724 ----
  }

! function get_admin_page_title() {
! 	global $title;
  	global $submenu;
! 	global $pagenow;
! 	global $plugin_page;
! 
! 	if (isset($title) && ! empty($title)) {
! 		return $title;
! 	}
! 
! 	foreach (array_keys($submenu) as $parent) {
! 		foreach ($submenu[$parent] as $submenu_array) {
! 			if (isset($submenu_array[3])) {
! 				if ($submenu_array[2] == $pagenow) {
! 					$title = $submenu_array[3];
! 					return $submenu_array[3];
! 				} else if (isset($plugin_page) && ($plugin_page == $submenu_array[2])) {
! 					$title = $submenu_array[3];
! 					return $submenu_array[3];
! 				}
! 			}
! 		}
! 	}
! 
! 	return '';
! }
! 
! function get_admin_page_parent() {
! 	global $parent_file;
! 	global $submenu;
! 	global $pagenow;
! 	global $plugin_page;
! 
! 	if (isset($parent_file) && ! empty($parent_file)) {
! 		return $parent_file;
! 	}
! 
! 	foreach (array_keys($submenu) as $parent) {
! 		foreach ($submenu[$parent] as $submenu_array) {
! 			if ($submenu_array[2] == $pagenow) {
! 				$parent_file = $parent;
! 				return $parent;
! 			} else if (isset($plugin_page) && ($plugin_page == $submenu_array[2])) {
! 				$parent_file = $parent;
! 				return $parent;
! 			}
! 		}
! 	}
! 
! 	$parent_file = '';
! 	return '';
! }
! 
! function add_options_page($page_title, $menu_title, $access_level, $file) {
! 	global $submenu;
! 
! 	$file = basename($file);
! 
! 	$submenu['options-general.php'][] = array($menu_title, $access_level, $file, $page_title);
  }

Index: edit-comments.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/edit-comments.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** edit-comments.php	5 Oct 2004 07:36:49 -0000	1.38
--- edit-comments.php	19 Oct 2004 03:03:03 -0000	1.39
***************
*** 1,4 ****
  <?php
! require_once('../wp-includes/wp-l10n.php');

  $title = __('Edit Comments');
--- 1,4 ----
  <?php
! require_once('admin.php');

  $title = __('Edit Comments');

Index: options-permalink.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-permalink.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** options-permalink.php	18 Oct 2004 04:52:02 -0000	1.47
--- options-permalink.php	19 Oct 2004 03:03:04 -0000	1.48
***************
*** 1,7 ****
  <?php
! require_once('../wp-includes/wp-l10n.php');

  $title = __('Permalink Options');
! require('./options-head.php');

  $home = get_settings('home');
--- 1,9 ----
  <?php
! require_once('admin.php');

  $title = __('Permalink Options');
! $parent_file = 'options-general.php';
! 
! include('admin-header.php');

  $home = get_settings('home');

Index: categories.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/categories.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** categories.php	5 Oct 2004 07:13:51 -0000	1.41
--- categories.php	19 Oct 2004 03:03:03 -0000	1.42
***************
*** 1,26 ****
  <?php
! require_once('../wp-includes/wp-l10n.php');

  $title = __('Categories');
  $parent_file = 'edit.php';

! function add_magic_quotes($array) {
!     foreach ($array as $k => $v) {
!         if (is_array($v)) {
!             $array[$k] = add_magic_quotes($v);
!         } else {
!             $array[$k] = addslashes($v);
!         }
!     }
!     return $array;
! }
! 
! if (!get_magic_quotes_gpc()) {
!     $_GET    = add_magic_quotes($_GET);
!     $_POST   = add_magic_quotes($_POST);
!     $_COOKIE = add_magic_quotes($_COOKIE);
! }
! 
! $wpvarstoreset = array('action','standalone','cat');
  for ($i=0; $i<count($wpvarstoreset); $i += 1) {
      $wpvar = $wpvarstoreset[$i];
--- 1,9 ----
  <?php
! require_once('admin.php');

  $title = __('Categories');
  $parent_file = 'edit.php';

! $wpvarstoreset = array('action','cat');
  for ($i=0; $i<count($wpvarstoreset); $i += 1) {
      $wpvar = $wpvarstoreset[$i];
***************
*** 42,48 ****
  case 'addcat':

-     $standalone = 1;
-     require_once('admin-header.php');
-     
      if ($user_level < 3)
          die (__('Cheatin&#8217; uh?'));
--- 25,28 ----
***************
*** 62,68 ****
  case 'Delete':

-     $standalone = 1;
-     require_once('admin-header.php');
- 
      check_admin_referer();

--- 42,45 ----
***************
*** 120,126 ****
  case 'editedcat':

-     $standalone = 1;
-     require_once('admin-header.php');
- 
      if ($user_level < 3)
          die (__('Cheatin&#8217; uh?'));
--- 97,100 ----
***************
*** 139,143 ****
  default:

-     $standalone = 0;
      require_once ('admin-header.php');
      if ($user_level < 3) {
--- 113,116 ----

--- NEW FILE: admin.php ---
<?php
require_once('../wp-config.php');
require_once(ABSPATH . 'wp-includes/wp-l10n.php');

require_once(ABSPATH . 'wp-admin/auth.php');
require(ABSPATH . 'wp-admin/admin-functions.php');

$dogs = $wpdb->get_results("SELECT * FROM $wpdb->categories");
foreach ($dogs as $catt) {
	$cache_categories[$catt->cat_ID] = $catt;
}

get_currentuserinfo();

$posts_per_page = get_settings('posts_per_page');
$what_to_show = get_settings('what_to_show');
$date_format = get_settings('date_format');
$time_format = get_settings('time_format');

function add_magic_quotes($array) {
	foreach ($array as $k => $v) {
		if (is_array($v)) {
			$array[$k] = add_magic_quotes($v);
		} else {
			$array[$k] = addslashes($v);
		}
	}
	return $array;
}

if (!get_magic_quotes_gpc()) {
	$_GET    = add_magic_quotes($_GET);
	$_POST   = add_magic_quotes($_POST);
	$_COOKIE = add_magic_quotes($_COOKIE);
}

$wpvarstoreset = array('profile','redirect','redirect_url','a','popuptitle','popupurl','text', 'trackback', 'pingback');
for ($i=0; $i<count($wpvarstoreset); $i += 1) {
    $wpvar = $wpvarstoreset[$i];
    if (!isset($$wpvar)) {
        if (empty($_POST["$wpvar"])) {
            if (empty($_GET["$wpvar"])) {
                $$wpvar = '';
            } else {
                $$wpvar = $_GET["$wpvar"];
            }
        } else {
            $$wpvar = $_POST["$wpvar"];
        }
    }
}

require(ABSPATH . '/wp-admin/menu.php');

// Handle plugin admin pages.
if (isset($_GET['page'])) {
	$plugin_page = basename($_GET['page']);
	if (! file_exists(ABSPATH . "wp-content/plugins/$plugin_page")) {
		die(sprintf(__('Cannot load %s.'), $plugin_page));
	}

	if (! isset($_GET['noheader'])) {
		require_once(ABSPATH . '/wp-admin/admin-header.php');
	}

	include(ABSPATH . "wp-content/plugins/$plugin_page");

	include(ABSPATH . 'wp-admin/admin-footer.php');	
}

?>
Index: menu.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/menu.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** menu.php	18 Oct 2004 04:50:07 -0000	1.29
--- menu.php	19 Oct 2004 03:03:04 -0000	1.30
***************
*** 1,4 ****
- 
- <ul id="adminmenu">
  <?php
  // This array constructs the admin menu bar.
--- 1,2 ----
***************
*** 50,95 ****
  }

! $self = preg_replace('|^.*/wp-admin/|i', '', $_SERVER['PHP_SELF']);
! $self = preg_replace('|^.*/plugins/|i', '', $self);
! 
! if (!isset($parent_file)) $parent_file = '';
! foreach ($menu as $item) {
! 	$class = '';
! 
!     // 0 = name, 1 = user_level, 2 = file
!     if ((substr($self, -10) == substr($item[2], -10) && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
!     
!     if ($user_level >= $item[1]) {
!         if (
! ('upload.php' == $item[2] && 
! get_settings('use_fileupload') && 
! ($user_level >= get_settings('fileupload_minlevel'))
!              ) || 'upload.php' != $item[2])
! 					echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";
!     }
! }
! 
! ?>
! 	<li class="last"><a href="<?php echo get_settings('siteurl')
! 	 ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account') ?>"><?php printf(__('Logout (%s)'), $user_nickname) ?></a></li>
! </ul>
! 
! <?php
! // Sub-menu
! if ( isset($submenu["$parent_file"]) ) :
! ?>
! <ul id="adminmenu2">
! <?php 
! foreach ($submenu["$parent_file"] as $item) : 
! 	 if ($user_level < $item[1]) {
! 		 continue;
! 	 }
! 
! 	if ( substr($self, -10) == substr($item[2], -10) ) $class = ' class="current"';
! 	else $class = '';
! 	echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";
! endforeach;
! ?>
! 
! </ul>
! <?php endif; ?>
\ No newline at end of file
--- 48,50 ----
  }

! ?>
\ No newline at end of file

Index: admin-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/admin-header.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** admin-header.php	18 Oct 2004 04:50:07 -0000	1.33
--- admin-header.php	19 Oct 2004 03:03:03 -0000	1.34
***************
*** 1,53 ****
! <?php
! 
! if (strstr($_SERVER['PHP_SELF'], 'plugins/')) {
! 	$wp_admin_path = '../../wp-admin/';
! 	$wp_path = '../../';
! } else {
! 	$wp_admin_path = './';
! 	$wp_path = '../';
! }
! 
! require_once($wp_path . 'wp-config.php');
! 
! require_once(ABSPATH . '/wp-admin/auth.php');
! require(ABSPATH . '/wp-admin/admin-functions.php');
! 
! $dogs = $wpdb->get_results("SELECT * FROM $wpdb->categories");
! foreach ($dogs as $catt) {
! 	$cache_categories[$catt->cat_ID] = $catt;
! }
! 
! get_currentuserinfo();
! 
! $posts_per_page = get_settings('posts_per_page');
! $what_to_show = get_settings('what_to_show');
! $date_format = get_settings('date_format');
! $time_format = get_settings('time_format');
! 
! $wpvarstoreset = array('profile','standalone','redirect','redirect_url','a','popuptitle','popupurl','text', 'trackback', 'pingback');
! for ($i=0; $i<count($wpvarstoreset); $i += 1) {
!     $wpvar = $wpvarstoreset[$i];
!     if (!isset($$wpvar)) {
!         if (empty($_POST["$wpvar"])) {
!             if (empty($_GET["$wpvar"])) {
!                 $$wpvar = '';
!             } else {
!                 $$wpvar = $_GET["$wpvar"];
!             }
!         } else {
!             $$wpvar = $_POST["$wpvar"];
!         }
!     }
! }
! 
! if ($standalone == 0) :
! 
! ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
  <title><?php bloginfo('name') ?> &rsaquo; <?php echo $title; ?> &#8212; WordPress</title>
! <link rel="stylesheet" href="<?php echo $wp_admin_path; ?>wp-admin.css" type="text/css" />
! <link rel="shortcut icon" href="<?php echo $wp_path; ?>wp-images/wp-favicon.png" />
  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo get_settings('blog_charset'); ?>" />

--- 1,9 ----
! <?php get_admin_page_title(); ?>
! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
  <title><?php bloginfo('name') ?> &rsaquo; <?php echo $title; ?> &#8212; WordPress</title>
! <link rel="stylesheet" href="wp-admin.css" type="text/css" />
! <link rel="shortcut icon" href="../wp-images/wp-favicon.png" />
  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo get_settings('blog_charset'); ?>" />

***************
*** 120,124 ****

  <?php
! require(ABSPATH . '/wp-admin/menu.php');
! endif;
  ?>
\ No newline at end of file
--- 76,83 ----

  <?php
! require(ABSPATH . '/wp-admin/menu-header.php');
! 
! if ( $parent_file == 'options-general.php' ) {
! 	require(ABSPATH . '/wp-admin/options-head.php');
! }
  ?>
\ No newline at end of file

Index: themes.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/themes.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** themes.php	6 Oct 2004 06:20:52 -0000	1.5
--- themes.php	19 Oct 2004 03:03:06 -0000	1.6
***************
*** 1,8 ****
  <?php

  if ( isset($_GET['action']) ) {
- 	$standalone = 1;
- 	require_once('admin-header.php');
- 
  	check_admin_referer();

--- 1,6 ----
  <?php
+ require_once('admin.php');

  if ( isset($_GET['action']) ) {
  	check_admin_referer();

***************
*** 22,34 ****
   }

- require_once('../wp-includes/wp-l10n.php');
  $title = __('Manage Themes');
  $parent_file = 'themes.php';
  require_once('admin-header.php');
- 
- if ($user_level < 9)
- 	die (__('Sorry, you must be at least a level 9 user to modify themes.'));
  ?>
- 
  <?php if ( ! validate_current_theme() ) : ?>
  <div class="updated"><p><?php _e('The active theme is broken.  Reverting to the default theme.'); ?></p></div>
--- 20,27 ----

Index: link-manager.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/link-manager.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** link-manager.php	10 Oct 2004 18:02:28 -0000	1.39
--- link-manager.php	19 Oct 2004 03:03:04 -0000	1.40
***************
*** 3,7 ****
  // Copyright (C) 2002, 2003 Mike Little -- mike at zed1.com

! require_once('../wp-config.php');

  $title = __('Manage Links');
--- 3,7 ----
  // Copyright (C) 2002, 2003 Mike Little -- mike at zed1.com

! require_once('admin.php');

  $title = __('Manage Links');
***************
*** 38,58 ****
  }

! function add_magic_quotes($array) {
!     foreach ($array as $k => $v) {
!         if (is_array($v)) {
!             $array[$k] = add_magic_quotes($v);
!         } else {
!             $array[$k] = addslashes($v);
!         }
!     }
!     return $array;
! }
! if (!get_magic_quotes_gpc()) {
!     $_GET    = add_magic_quotes($_GET);
!     $_POST   = add_magic_quotes($_POST);
!     $_COOKIE = add_magic_quotes($_COOKIE);
! }
! 
! $wpvarstoreset = array('action','standalone','cat_id', 'linkurl', 'name', 'image',
                         'description', 'visible', 'target', 'category', 'link_id',
                         'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel',
--- 38,42 ----
  }

! $wpvarstoreset = array('action','cat_id', 'linkurl', 'name', 'image',
                         'description', 'visible', 'target', 'category', 'link_id',
                         'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel',
***************
*** 84,90 ****
    case 'assign':
    {
-     $standalone = 1;
-     include_once('admin-header.php');
- 
      check_admin_referer();

--- 68,71 ----
***************
*** 117,123 ****
    case 'visibility':
    {
-     $standalone = 1;
-     include_once('admin-header.php');
- 
      check_admin_referer();

--- 98,101 ----
***************
*** 157,163 ****
    case 'move':
    {
-     $standalone = 1;
-     include_once('admin-header.php');
- 
      check_admin_referer();

--- 135,138 ----
***************
*** 181,187 ****
    case 'Add':
    {
-     $standalone = 1;
-     include_once('admin-header.php');
- 
      check_admin_referer();

--- 156,159 ----
***************
*** 231,237 ****
        $links_show_cat_id = $cat_id;

-       $standalone = 1;
-       include_once('admin-header.php');
- 
        check_admin_referer();

--- 203,206 ----
***************
*** 277,283 ****
    case 'Delete':
    {
-     $standalone = 1;
-     include_once('admin-header.php');
- 
      check_admin_referer();

--- 246,249 ----
***************
*** 304,308 ****
    case 'linkedit':
    {
-     $standalone=0;
  	$xfn = true;
      include_once ('admin-header.php');
--- 270,273 ----
***************
*** 570,574 ****
      setcookie('links_show_cat_id_' . COOKIEHASH, $links_show_cat_id, time()+600);
      setcookie('links_show_order_' . COOKIEHASH, $links_show_order, time()+600);
-     $standalone=0;
      include_once ("./admin-header.php");
      if ($user_level < 5) {
--- 535,538 ----

Index: post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/post.php,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** post.php	18 Oct 2004 15:58:06 -0000	1.103
--- post.php	19 Oct 2004 03:03:05 -0000	1.104
***************
*** 1,21 ****
  <?php
! require_once('../wp-includes/wp-l10n.php');
! 
! function add_magic_quotes($array) {
! foreach ($array as $k => $v) {
! 	if (is_array($v)) {
! 		$array[$k] = add_magic_quotes($v);
! 	} else {
! 		$array[$k] = addslashes($v);
! 	}
! }
! return $array;
! }
! 
! if (!get_magic_quotes_gpc()) {
! 	$_GET    = add_magic_quotes($_GET);
! 	$_POST   = add_magic_quotes($_POST);
! 	$_COOKIE = add_magic_quotes($_COOKIE);
! }

  $wpvarstoreset = array('action', 'safe_mode', 'withcomments', 'posts', 'poststart', 'postend', 'content', 'edited_post_title', 'comment_error', 'profile', 'trackback_url', 'excerpt', 'showcomments', 'commentstart', 'commentend', 'commentorder', 'enclosure_url' );
--- 1,4 ----
  <?php
! require_once('admin.php');

  $wpvarstoreset = array('action', 'safe_mode', 'withcomments', 'posts', 'poststart', 'postend', 'content', 'edited_post_title', 'comment_error', 'profile', 'trackback_url', 'excerpt', 'showcomments', 'commentstart', 'commentend', 'commentorder', 'enclosure_url' );
***************
*** 38,42 ****
  switch($action) {
  case 'post':
- 	$standalone = 1;
  	require_once('admin-header.php');

--- 21,24 ----
***************
*** 184,188 ****
  	$title = __('Edit');

- 	$standalone = 0;
  	require_once('admin-header.php');

--- 166,169 ----
***************
*** 237,243 ****
  case 'editpost':
  // die(var_dump('<pre>', $_POST));
- 	$standalone = 1;
- 	require_once('./admin-header.php');
- 
  	if (!isset($blog_ID)) {
  		$blog_ID = 1;
--- 218,221 ----
***************
*** 399,406 ****

  case 'delete':
- 
- 	$standalone = 1;
- 	require_once('./admin-header.php');
- 
  	check_admin_referer();

--- 377,380 ----
***************
*** 429,433 ****
  case 'editcomment':
  	$title = __('Edit Comment');
- 	$standalone = 0;
  	$parent_file = 'edit.php';
  	require_once ('admin-header.php');
--- 403,406 ----
***************
*** 452,456 ****
  case 'confirmdeletecomment':

- $standalone = 0;
  require_once('./admin-header.php');

--- 425,428 ----
***************
*** 488,494 ****
  case 'deletecomment':

- $standalone = 1;
- require_once('./admin-header.php');
- 
  check_admin_referer();

--- 460,463 ----
***************
*** 521,525 ****
  case 'unapprovecomment':

- $standalone = 1;
  require_once('./admin-header.php');

--- 490,493 ----
***************
*** 552,558 ****
  case 'mailapprovecomment':

- $standalone = 1;
- require_once('./admin-header.php');
- 
  $comment = (int) $_GET['comment'];

--- 520,523 ----
***************
*** 575,581 ****
  case 'approvecomment':

- $standalone = 1;
- require_once('./admin-header.php');
- 
  $comment = $_GET['comment'];
  $p = $_GET['p'];
--- 540,543 ----
***************
*** 607,613 ****
  case 'editedcomment':

- 	$standalone = 1;
- 	require_once('./admin-header.php');
- 
  	$comment_ID = $_POST['comment_ID'];
  	$comment_post_ID = $_POST['comment_post_ID'];
--- 569,572 ----
***************
*** 654,658 ****

  default:
- 	$standalone = 0;
  	$title = __('Create New Post');
  	require_once ('./admin-header.php');
--- 613,616 ----

Index: options-head.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-head.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** options-head.php	18 Oct 2004 04:50:07 -0000	1.13
--- options-head.php	19 Oct 2004 03:03:04 -0000	1.14
***************
*** 1,23 ****
  <?php

- $parent_file = 'options-general.php';
- 
- function add_magic_quotes($array) {
- 	foreach ($array as $k => $v) {
- 		if (is_array($v)) {
- 			$array[$k] = add_magic_quotes($v);
- 		} else {
- 			$array[$k] = addslashes($v);
- 		}
- 	}
- 	return $array;
- }
- 
- if (!get_magic_quotes_gpc()) {
- 	$_GET    = add_magic_quotes($_GET);
- 	$_POST   = add_magic_quotes($_POST);
- 	$_COOKIE = add_magic_quotes($_COOKIE);
- }
- 
  $wpvarstoreset = array('action','standalone', 'option_group_id');
  for ($i=0; $i<count($wpvarstoreset); $i += 1) {
--- 1,4 ----
***************
*** 35,46 ****
  	}
  }
- 
- $standalone = 0;
- include_once('admin-header.php');
  ?>

  <br clear="all" />

! <?php if (isset($updated)) : ?>
  <div class="updated"><p><strong><?php _e('Options saved.') ?></strong></p></div>
  <?php endif; ?>
\ No newline at end of file
--- 16,24 ----
  	}
  }
  ?>

  <br clear="all" />

! <?php if (isset($_GET['updated'])) : ?>
  <div class="updated"><p><strong><?php _e('Options saved.') ?></strong></p></div>
  <?php endif; ?>
\ No newline at end of file

Index: moderation.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/moderation.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** moderation.php	5 Oct 2004 07:13:51 -0000	1.19
--- moderation.php	19 Oct 2004 03:03:04 -0000	1.20
***************
*** 1,25 ****
  <?php
! require_once('../wp-includes/wp-l10n.php');

  $title = __('Moderate comments');
  $parent_file = 'edit.php';

- function add_magic_quotes($array) {
- 	foreach ($array as $k => $v) {
- 		if (is_array($v)) {
- 			$array[$k] = add_magic_quotes($v);
- 		} else {
- 			$array[$k] = addslashes($v);
- 		}
- 	}
- 	return $array;
- } 
- 
- if (!get_magic_quotes_gpc()) {
- 	$_GET    = add_magic_quotes($_GET);
- 	$_POST   = add_magic_quotes($_POST);
- 	$_COOKIE = add_magic_quotes($_COOKIE);
- }
- 
  $wpvarstoreset = array('action','item_ignored','item_deleted','item_approved');
  for ($i=0; $i<count($wpvarstoreset); $i += 1) {
--- 1,8 ----
  <?php
! require_once('admin.php');

  $title = __('Moderate comments');
  $parent_file = 'edit.php';

  $wpvarstoreset = array('action','item_ignored','item_deleted','item_approved');
  for ($i=0; $i<count($wpvarstoreset); $i += 1) {
***************
*** 49,55 ****
  case 'update':

- 	$standalone = 1;
- 	require_once('admin-header.php');
- 
  	if ($user_level < 3) {
  		die(__('<p>Your level is not high enough to moderate comments.</p>'));
--- 32,35 ----

Index: plugins.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/plugins.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** plugins.php	26 Sep 2004 18:12:12 -0000	1.16
--- plugins.php	19 Oct 2004 03:03:05 -0000	1.17
***************
*** 1,8 ****
  <?php

  if ( isset($_GET['action']) ) {
- 	$standalone = 1;
- 	require_once('admin-header.php');
- 
  	check_admin_referer();

--- 1,6 ----
  <?php
+ require_once('admin.php');

  if ( isset($_GET['action']) ) {
  	check_admin_referer();

***************
*** 25,35 ****
  }

- require_once('../wp-includes/wp-l10n.php');
  $title = __('Manage Plugins');
  require_once('admin-header.php');

- if ($user_level < 9) // Must be at least level 9
- 	die (__('Sorry, you must be at least a level 8 user to modify plugins.'));
- 
  // Clean up options
  // If any plugins don't exist, axe 'em
--- 23,29 ----

Index: profile.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/profile.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** profile.php	10 Oct 2004 18:02:28 -0000	1.31
--- profile.php	19 Oct 2004 03:03:06 -0000	1.32
***************
*** 1,26 ****
  <?php 
! require_once('../wp-includes/wp-l10n.php');

  $title = "Profile";
  $parent_file = 'profile.php';

! function add_magic_quotes($array) {
! 	foreach ($array as $k => $v) {
! 		if (is_array($v)) {
! 			$array[$k] = add_magic_quotes($v);
! 		} else {
! 			$array[$k] = addslashes($v);
! 		}
! 	}
! 	return $array;
! } 
! 
! if (!get_magic_quotes_gpc()) {
! 	$_GET    = add_magic_quotes($_GET);
! 	$_POST   = add_magic_quotes($_POST);
! 	$_COOKIE = add_magic_quotes($_COOKIE);
! }
! 
! $wpvarstoreset = array('action','standalone','redirect','profile','user');
  for ($i=0; $i<count($wpvarstoreset); $i += 1) {
  	$wpvar = $wpvarstoreset[$i];
--- 1,9 ----
  <?php 
! require_once('admin.php');

  $title = "Profile";
  $parent_file = 'profile.php';

! $wpvarstoreset = array('action','redirect','profile','user');
  for ($i=0; $i<count($wpvarstoreset); $i += 1) {
  	$wpvar = $wpvarstoreset[$i];

--- NEW FILE: menu-header.php ---
<ul id="adminmenu">
<?php
$self = preg_replace('|^.*/wp-admin/|i', '', $_SERVER['PHP_SELF']);
$self = preg_replace('|^.*/plugins/|i', '', $self);

get_admin_page_parent();

foreach ($menu as $item) {
	$class = '';

    // 0 = name, 1 = user_level, 2 = file
    if ((substr($self, -10) == substr($item[2], -10) && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';

    if ($user_level >= $item[1]) {
        if (
('upload.php' == $item[2] && 
get_settings('use_fileupload') && 
($user_level >= get_settings('fileupload_minlevel'))
             ) || 'upload.php' != $item[2])
					echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";
    }
}

?>
	<li class="last"><a href="<?php echo get_settings('siteurl')
	 ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account') ?>"><?php printf(__('Logout (%s)'), $user_nickname) ?></a></li>
</ul>

<?php
// Sub-menu
if ( isset($submenu["$parent_file"]) ) :
?>
<ul id="adminmenu2">
<?php 
foreach ($submenu["$parent_file"] as $item) : 
	 if ($user_level < $item[1]) {
		 continue;
	 }

if ( (substr($self, -10) == substr($item[2], -10)) || (isset($plugin_page) && $plugin_page == $item[2]) ) $class = ' class="current"';
	else $class = '';

if (file_exists(ABSPATH . "wp-content/plugins/{$item[2]}"))
	echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";			
 else
	echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";
endforeach;
?>

</ul>
<?php endif; ?>
Index: user-edit.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/user-edit.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** user-edit.php	8 Aug 2004 20:38:19 -0000	1.3
--- user-edit.php	19 Oct 2004 03:03:06 -0000	1.4
***************
*** 1,23 ****
  <?php
! require_once('../wp-includes/wp-l10n.php');

  $title = __('Edit User');

! function add_magic_quotes($array) {
!   foreach ($array as $k => $v) {
!     if (is_array($v)) {
!       $array[$k] = add_magic_quotes($v);
!     } else {
!       $array[$k] = addslashes($v);
!     }
!   }
!   return $array;
! }
! 
! if (!get_magic_quotes_gpc()) {
! 	$_POST   = add_magic_quotes($_POST);
! }
! 
! $wpvarstoreset = array('action', 'standalone', 'redirect', 'profile', 'user_id');
  for ($i=0; $i<count($wpvarstoreset); $i += 1) {
  	$wpvar = $wpvarstoreset[$i];
--- 1,8 ----
  <?php
! require_once('admin.php');

  $title = __('Edit User');

! $wpvarstoreset = array('action', 'redirect', 'profile', 'user_id');
  for ($i=0; $i<count($wpvarstoreset); $i += 1) {
  	$wpvar = $wpvarstoreset[$i];
***************
*** 84,90 ****
  case 'switchposts':

- $standalone = 1;
- require_once('admin-header.php');
- 
  check_admin_referer();

--- 69,72 ----
***************
*** 95,99 ****
  default:

- $standalone = 0;
  include ('admin-header.php');

--- 77,80 ----

Index: edit.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/edit.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** edit.php	5 Oct 2004 06:59:13 -0000	1.35
--- edit.php	19 Oct 2004 03:03:03 -0000	1.36
***************
*** 1,4 ****
  <?php
! require_once('../wp-includes/wp-l10n.php');

  $title = __('Posts');
--- 1,4 ----
  <?php
! require_once('admin.php');

  $title = __('Posts');

Index: link-import.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/link-import.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** link-import.php	5 Sep 2004 00:24:26 -0000	1.16
--- link-import.php	19 Oct 2004 03:03:04 -0000	1.17
***************
*** 3,8 ****
  // Copyright (C) 2002 Mike Little -- mike at zed1.com

! require_once('../wp-config.php');
! 
  $parent_file = 'link-manager.php';
  $title = __('Import Blogroll');
--- 3,7 ----
  // Copyright (C) 2002 Mike Little -- mike at zed1.com

! require_once('admin.php');
  $parent_file = 'link-manager.php';
  $title = __('Import Blogroll');
***************
*** 16,20 ****
      case 0:
      {
-         $standalone = 0;
          include_once('admin-header.php');
          if ($user_level < 5)
--- 15,18 ----
***************
*** 73,77 ****

      case 1: {
-                 $standalone = 0;
                  include_once('admin-header.php');
                  if ($user_level < 5)
--- 71,74 ----