? wp-admin/.DS_Store
? wp-admin/._admin-functions.php
? wp-admin/._admin.php
? wp-admin/._menu-header.php
? wp-admin/._options-permalink.php
? wp-admin/._options.php
Index: wp-admin/admin-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/admin-functions.php,v
retrieving revision 1.78
diff -r1.78 admin-functions.php
812a813,836
> function show_plugin_page($type = false) {
> 	global $wp_filter, $plugin_page;
> 	
> 	$plugin_name = preg_replace('!\.php!', '', $plugin_page);
> 	
> 	if ($type && isset($wp_filter[$type . '_page_' . $plugin_name])) {
> 		
> 		do_action($type . '_page_' . $plugin_name);
> 		
> 	} else {
> 		if ( validate_file($plugin_page) ) {
> 			die(__('Invalid plugin page'));
> 		}
> 
> 		if (! file_exists(ABSPATH . "wp-content/plugins/$plugin_page"))
> 			die(sprintf(__('Cannot load %s.'), $plugin_page));
> 
> 		include(ABSPATH . "wp-content/plugins/$plugin_page");
> 	}
> 	
> 	include(ABSPATH . 'wp-admin/admin-footer.php');
> }
> 
> 
Index: wp-admin/admin.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/admin.php,v
retrieving revision 1.7
diff -r1.7 admin.php
41c41
< // Handle plugin admin pages.
---
> // For plugin Options/Management pages
44,45c44,51
< 	if ( validate_file($plugin_page) ) {
< 		die(__('Invalid plugin page'));
---
> 	
> 	// Maintain backward compatibility with double-loading plugins
> 	if ($pagenow == 'admin.php') {
> 		
> 		if (! isset($_GET['noheader']))
> 			require_once(ABSPATH . '/wp-admin/admin-header.php');
> 			
> 		show_plugin_page();
47,56d52
< 
< 	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: wp-admin/edit.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/edit.php,v
retrieving revision 1.42
diff -r1.42 edit.php
4d3
< $title = __('Posts');
6c5,16
< require_once('admin-header.php');
---
> 
> // Handle plugin Management page.
> if ($plugin_page) :
> 	if (! isset($_GET['noheader']))
> 		require_once(ABSPATH . '/wp-admin/admin-header.php');
> 		
> 	show_plugin_page('management');
> 
> else :
> 
> $title = __('Posts');
> require_once(ABSPATH . '/wp-admin/admin-header.php');
220a231,232
> 
> endif;
Index: wp-admin/menu-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/menu-header.php,v
retrieving revision 1.4
diff -r1.4 menu-header.php
38c38
< if ( (substr($self, -10) == substr($item[2], -10)) || (isset($plugin_page) && $plugin_page == $item[2]) ) $class = ' class="current"';
---
> if ( (!isset($plugin_page) && (substr($self, -10) == substr($item[2], -10))) || (isset($plugin_page) && $plugin_page == $item[2]) ) $class = ' class="current"';
42,44c42,53
< 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
---
> if (file_exists(ABSPATH . "wp-content/plugins/{$item[2]}")) {
> 	// Maintain backward-compatibility with double-loading plugins
> 	if (isset($wp_filter['options_page_' . str_replace('.php', '', $item[2])]) || isset($wp_filter['management_page_' . str_replace('.php', '', $item[2])])) {
> 		if ($parent_file == 'options-general.php')
> 			echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/options.php?page={$item[2]}'$class>{$item[0]}</a></li>";
> 		elseif ($parent_file == 'edit.php')
> 			echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/edit.php?page={$item[2]}'$class>{$item[0]}</a></li>";
> 	}
> 	else
> 		echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
> }
> else {
45a55
> }
Index: wp-admin/options.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options.php,v
retrieving revision 1.41
diff -r1.41 options.php
4d3
< $title = __('Options');
7a7,17
> // Handle plugin Options page.
> if ($plugin_page) :
> 	if (! isset($_GET['noheader']))
> 		require_once(ABSPATH . '/wp-admin/admin-header.php');
> 		
> 	show_plugin_page('options');
> 
> else :
> 
> $title = __('Options');
> 
124a135,136
> 
> endif;