summaryrefslogtreecommitdiffstats
path: root/wp-admin/admin.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-07-27 14:47:30 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-07-27 14:47:30 +0000
commit503214a304ab0ce46df6feae4c052abcd941af98 (patch)
tree60d8047e0ac5b79aa7b9cdbbf4168c4a51bc050f /wp-admin/admin.php
parent9869401a21a143eb2369beb24d8446d855c41464 (diff)
downloadwordpress-mu-503214a304ab0ce46df6feae4c052abcd941af98.tar.gz
wordpress-mu-503214a304ab0ce46df6feae4c052abcd941af98.tar.xz
wordpress-mu-503214a304ab0ce46df6feae4c052abcd941af98.zip
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@712 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/admin.php')
-rw-r--r--wp-admin/admin.php12
1 files changed, 9 insertions, 3 deletions
diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index b6e270c..91196b0 100644
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -39,12 +39,15 @@ wp_enqueue_script( 'fat' );
$editing = false;
-require(ABSPATH . '/wp-admin/menu.php');
-
-// Handle plugin admin pages.
if (isset($_GET['page'])) {
$plugin_page = stripslashes($_GET['page']);
$plugin_page = plugin_basename($plugin_page);
+}
+
+require(ABSPATH . '/wp-admin/menu.php');
+
+// Handle plugin admin pages.
+if (isset($plugin_page)) {
$page_hook = get_plugin_page_hook($plugin_page, $pagenow);
if ( $page_hook ) {
@@ -76,6 +79,9 @@ if (isset($_GET['page'])) {
$importer = $_GET['import'];
+ if ( ! current_user_can('import') )
+ wp_die(__('You are not allowed to import.'));
+
if ( validate_file($importer) ) {
wp_die(__('Invalid importer.'));
}