Wordpress 3.0.1

[autoinstalls/wordpress.git] / wp-admin / admin.php

diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index a759d452b091437032d4d6da060b5a4f8d6b658c..998ff1ff1e64952dccb5e48c5daf36209b582add 100644 (file)
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -152,7 +152,7 @@ if ( isset($plugin_page) ) {
                if ( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") )
                        include(WPMU_PLUGIN_DIR . "/$plugin_page");
                else
-                       include(ABSPATH . PLUGINDIR . "/$plugin_page");
+                       include(WP_PLUGIN_DIR . "/$plugin_page");
        }
 
        include(ABSPATH . 'wp-admin/admin-footer.php');
@@ -200,6 +200,16 @@ if ( isset($plugin_page) ) {
        exit();
 } else {
        do_action("load-$pagenow");
+       // Backwards compatibility with old load-page-new.php, load-page.php,   
+       // and load-categories.php actions.  
+       if ( $typenow == 'page' ) {  
+               if ( $pagenow == 'post-new.php' )  
+                       do_action( 'load-page-new.php' );  
+               elseif ( $pagenow == 'post.php' )  
+                       do_action( 'load-page.php' );  
+       }  elseif ( $taxnow == 'category' && $pagenow == 'edit-tags.php' ) {
+               do_action( 'load-categories.php' );
+       }
 }
 
 if ( !empty($_REQUEST['action']) )