From 4568e83625d817b265f23157dc38de4b29e28b68 Mon Sep 17 00:00:00 2001 From: rboren Date: Mon, 18 Oct 2004 04:50:08 +0000 Subject: [PATCH] Do not stomp permalink setting. Bug 372. git-svn-id: http://svn.automattic.com/wordpress/trunk@1810 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/admin-functions.php | 45 +++++++++++++++++++++++++++++++++ wp-admin/admin-header.php | 17 ++++++++++--- wp-admin/auth.php | 2 +- wp-admin/menu.php | 18 ++++++++++--- wp-admin/options-discussion.php | 37 --------------------------- wp-admin/options-general.php | 37 --------------------------- wp-admin/options-head.php | 38 ++++++++++++++++++++++++++-- wp-admin/options-misc.php | 38 ---------------------------- wp-admin/options-permalink.php | 24 ++++++++++-------- wp-admin/options-reading.php | 37 --------------------------- wp-admin/options-writing.php | 4 --- 11 files changed, 123 insertions(+), 174 deletions(-) diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 63dd7b900..0f9111bae 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -622,4 +622,49 @@ function parent_dropdown($default = 0, $parent = 0, $level = 0) { } } +function user_can_access_admin_page() { + global $parent_file; + global $pagenow; + global $menu; + global $submenu; + global $user_level; + + if (! isset($parent_file)) { + $parent = $pagenow; + } else { + $parent = $parent_file; + } + + foreach ($menu as $menu_array) { + //echo "parent array: " . $menu_array[2]; + if ($menu_array[2] == $parent) { + if ($user_level < $menu_array[1]) { + return false; + } else { + break; + } + } + } + + if (isset($submenu[$parent])) { + foreach ($submenu[$parent] as $submenu_array) { + if ($submenu_array[2] == $pagenow) { + if ($user_level < $submenu_array[1]) { + return false; + } else { + return true; + } + } + } + } + + return true; +} + +function add_options_menu($title, $access_level, $file) { + global $submenu; + + $submenu['options-general.php'][] = array($title, $access_level, $file); +} + ?> \ No newline at end of file diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index 3a107315a..a3c9a6479 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -1,6 +1,15 @@ <?php bloginfo('name') ?> › <?php echo $title; ?> — WordPress - - + + @@ -110,6 +119,6 @@ window.onload = blurry; \ No newline at end of file diff --git a/wp-admin/auth.php b/wp-admin/auth.php index 957f2114f..4a1599883 100644 --- a/wp-admin/auth.php +++ b/wp-admin/auth.php @@ -1,5 +1,5 @@ = get_settings('fileupload_minlevel')) ) || 'upload.php' != $item[2]) - echo "\n\t
  • {$item[0]}
    • "; + echo "\n\t
  • {$item[0]}
    • "; } } @@ -73,9 +81,13 @@ if ( isset($submenu["$parent_file"]) ) :