summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-11-21 10:20:48 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-11-21 10:20:48 +0000
commitff3bf19b3af49593d927b50d5c231526159821b3 (patch)
tree88052e04ccfb3d7c1bc6058374f8a24e2a3a0f18
parentca9480281cb3cb331788f8475b1e080bff59ec8d (diff)
downloadwordpress-mu-ff3bf19b3af49593d927b50d5c231526159821b3.tar.gz
wordpress-mu-ff3bf19b3af49593d927b50d5c231526159821b3.tar.xz
wordpress-mu-ff3bf19b3af49593d927b50d5c231526159821b3.zip
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@443 7be80a69-a1ef-0310-a953-fb0f7c49ff36
-rw-r--r--wp-inst/wp-admin/menu.php2
-rw-r--r--wp-inst/wp-admin/upgrade.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/wp-inst/wp-admin/menu.php b/wp-inst/wp-admin/menu.php
index e9e586e..0b18a73 100644
--- a/wp-inst/wp-admin/menu.php
+++ b/wp-inst/wp-admin/menu.php
@@ -20,7 +20,7 @@ if ( current_user_can('edit_users') )
$menu[35] = array(__('Users'), 'read', 'profile.php');
else
$menu[35] = array(__('Profile'), 'read', 'profile.php');
-$menu[40] = array(__('Options'), 'read', 'options-general.php');
+$menu[40] = array(__('Options'), 'manage_options', 'options-general.php');
$menu[45] = array(__('Import'), 'import', 'import.php');
/*
diff --git a/wp-inst/wp-admin/upgrade.php b/wp-inst/wp-admin/upgrade.php
index ce0dabd..263dd90 100644
--- a/wp-inst/wp-admin/upgrade.php
+++ b/wp-inst/wp-admin/upgrade.php
@@ -80,7 +80,7 @@ switch($step) {
wp_cache_flush();
?>
<h2><?php _e('Step 1'); ?></h2>
- <p><?php printf(__("There's actually only one step. So if you see this, you're done. <a href='%s'>Have fun</a>!"), __get_option('home')); ?></p>
+ <p><?php printf(__("There's actually only one step. So if you see this, you're done. <a href='%s'>Have fun</a>!"), __get_option('home') . '/'); ?></p>
<!--
<pre>