--- wpcom_adminbar.php.orig	2006-10-11 22:32:14.000000000 +0100
+++ wpcom_adminbar.php	2007-01-27 09:52:02.000000000 +0000
@@ -12,7 +12,6 @@
 add_action('wp_head', 'wpcom_adminbar_head');
 
 function wpcom_adminbar_head() {
-	if (!function_exists('current_user_can')) return; // For users who try to run this in pre-WP 2.0 conditions
 	if (current_user_can('read')) {
 		add_action('wp_footer', 'wpcom_adminbar');
 		echo '	<link rel="stylesheet" href="' . get_bloginfo('wpurl') . '/wp-content/plugins/wpcom_adminbar/wpcom_adminbar.css" type="text/css" />' . "\n";
@@ -22,11 +21,9 @@
 
 // Make the admin bar
 function wpcom_adminbar() {
-	global $wpdb, $wp_db_version;
+	global $wpdb;
 
 	$wpurl	= get_bloginfo('wpurl');
-	$posturl = ($wp_db_version >= '3563') ? 'post-new.php' : 'post.php'; // Changed in WP v2.1
-
 	?>
 
 <!-- Start WordPress Admin Bar -->
@@ -34,14 +31,28 @@
 <div id="wpcombar">
 	<div>
 		<ul>
-			<li><a href="<?php echo $wpurl; ?>/wp-admin/"><?php _e('Dashboard'); ?></a></li>
+			<?php if (function_exists('wp_shortstat_display_stats') || class_exists('wpStatsAdmin')) {  ?>
+			<li class="menupop" onmouseover="showNav(this)" onmouseout="hideNav(this)">
+				<a href="<?php echo $wpurl; ?>/wp-admin/"><span><?php _e('Dashboard'); ?></span></a>
+				<ul>
+				<?php if (function_exists('wp_shortstat_display_stats')) { ?>
+						<li><a href="<?php echo $wpurl; ?>/wp-admin/index.php?page=wp-shortstat.php"><?php _e('ShortStat'); ?></a></li>
+				<?php } ?>
+				<?php if (class_exists('wpStatsAdmin')) { ?>
+						<li><a href="<?php echo $wpurl; ?>/wp-admin/index.php?page=wpStats"><?php _e('wpStats'); ?></a></li>
+				<?php } ?>
+				</ul>
+			<?php } else { ?>
+				<li><a href="<?php echo $wpurl; ?>/wp-admin/"><?php _e('Dashboard'); ?></a>
+			<?php } ?>
+			</li>
 <?php if (current_user_can('edit_posts')) :
 	$awaiting_mod = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'"); // For the "Awaiting Moderation" count
 	?>
 			<li class="menupop" onmouseover="showNav(this)" onmouseout="hideNav(this)">
-				<a href="<?php echo $wpurl; ?>/wp-admin/<?php echo $posturl; ?>"><span><?php _e('Write'); ?></span></a>
+				<a href="<?php echo $wpurl; ?>/wp-admin/post-new.php"><span><?php _e('Write'); ?></span></a>
 				<ul>
-					<li><a href="<?php echo $wpurl; ?>/wp-admin/<?php echo $posturl; ?>"><?php _e('Write Post'); ?></a></li>
+					<li><a href="<?php echo $wpurl; ?>/wp-admin/post-new.php"><?php _e('Write Post'); ?></a></li>
 <?php if (current_user_can('edit_pages')) { ?>					<li><a href="<?php echo $wpurl; ?>/wp-admin/page-new.php"><?php _e('Write Page'); ?></a></li><?php echo "\n"; } ?>
 				</ul>
 			</li>
@@ -52,35 +63,56 @@
 					<li><a href="<?php echo $wpurl; ?>/wp-admin/edit.php"><?php _e('Posts'); ?></a></li>
 <?php if (current_user_can('edit_pages')) { ?>					<li><a href="<?php echo $wpurl; ?>/wp-admin/edit-pages.php"><?php _e('Pages'); ?></a></li><?php echo "\n"; } ?>
 <?php if (current_user_can('manage_categories')) { ?>					<li><a href="<?php echo $wpurl; ?>/wp-admin/categories.php"><?php _e('Categories'); ?></a></li><?php echo "\n"; } ?>
-					<li><a href="<?php echo $wpurl; ?>/wp-admin/edit-comments.php"><?php _e('Comments'); ?></a></li>
+<?php if (function_exists('jal_democracy')) { ?>					<li><a href="<?php echo $wpurl; ?>/wp-admin/edit.php?page=democracy"><?php _e('Democracy Poll', 'democracy') ?></a></li><?php echo "\n"; } ?>
+<?php if (function_exists('sk2_add_options')) { ?>					<li><a href="<?php echo $wpurl; ?>/wp-admin/edit.php?page=spamkarma2"><?php _e('Spam Karma 2'); ?></a></li><?php echo "\n"; } ?>
+<?php if (class_exists('subscribe2')) { ?>					<li><a href="<?php echo $wpurl; ?>/wp-admin/edit.php?page=subscribe2/subscribe2.php"><?php _e('Subscribers', 'subscribe2'); ?></a></li><?php echo "\n"; } ?>
+<?php if (function_exists('gravatar_manage_cache')) { ?>					<li><a href="<?php echo $wpurl; ?>/wp-admin/edit.php?page=gravatars2.php"><?php _e('Gravatar Cache', 'gravatars'); ?></a></li><?php echo "\n"; } ?>
+				</ul>
+			</li>
+<?php endif; ?>
+
+<?php
+if (current_user_can('moderate_comments')) : ?>
+
+<li class="menupop" onmouseover="showNav(this)" onmouseout="hideNav(this)">
+				<a href="<?php echo $wpurl; ?>/wp-admin/edit-comments.php"><span><?php _e('Comments'); ?></span></a>
+				<ul>
 					<li><a href="<?php echo $wpurl; ?>/wp-admin/moderation.php"><?php echo sprintf(__('Awaiting Moderation (%s)'), $awaiting_mod); ?></a></li>
 <?php
-if (current_user_can('manage_options')) {
-	if (function_exists('jal_democracy')) {
-		?>				<li><a href="<?php echo $wpurl; ?>/wp-admin/edit.php?page=democracy"><?php _e('Democracy Poll', 'democracy') ?></a></li><?php echo "\n";
+	if ((function_exists('akismet_spam_count'))) {
+		?>				<li><a href="<?php echo $wpurl; ?>/wp-admin/edit-comments.php?page=akismet-admin"><?php echo sprintf(__('Akismet Spam (%s)'), akismet_spam_count()); ?></a></li><?php echo "\n";
 	}
-	if (function_exists('ksd_spam_count')) {
-		?>				<li><a href="<?php echo $wpurl; ?>/wp-admin/edit.php?page=akismet/akismet.php"><?php echo sprintf(__('Akismet Spam (%s)'), ksd_spam_count()); ?></a></li><?php echo "\n";
-	}
-	if (function_exists('sk2_add_options')) {
-		?>				<li><a href="<?php echo $wpurl; ?>/wp-admin/edit.php?page=spamkarma2"><?php _e('Spam Karma 2'); ?></a></li><?php echo "\n";
-	}
-	if (class_exists('subscribe2')) {
-		?>				<li><a href="<?php echo $wpurl; ?>/wp-admin/edit.php?page=subscribe2.php"><?php _e('Subscribers', 'subscribe2'); ?></a></li><?php echo "\n";
-	}
-	if (function_exists('gravatar_manage_cache')) {
-		?>				<li><a href="<?php echo $wpurl; ?>/wp-admin/edit.php?page=gravatars2.php"><?php _e('Gravatar Cache', 'gravatars'); ?></a></li><?php echo "\n";
-	}
-}
 ?>
-				</ul>
-			</li>
+</ul>
+
 <?php endif; ?>
+
+<?php if (current_user_can('manage_links')) { ?>
+	<li class="menupop" onmouseover="showNav(this)" onmouseout="hideNav(this)">
+		<a href="<?php echo $wpurl; ?>/wp-admin/link-manager.php"><span><?php _e('Blogroll'); ?></span></a>
+		<ul>
+			<li><a href="<?php echo $wpurl; ?>/wp-admin/link-manager.php"><?php _e('Manage Blogroll'); ?></a></li>
+			<li><a href="<?php echo $wpurl; ?>/wp-admin/link-add.php"><?php _e('Add Link'); ?></a></li>
+			<li><a href="<?php echo $wpurl; ?>/wp-admin/link-import.php"><?php _e('Import Links'); ?></a></li>
+		</ul>
+	</li>
+<?php } ?>	
 		</ul>
 	</div>
 	<div class="rightside">
 		<ul>
 <?php if (current_user_can('activate_plugins')) { ?>			<li><a href="<?php echo $wpurl; ?>/wp-admin/plugins.php"><?php _e('Plugins'); ?></a></li><?php echo "\n"; } ?>
+<?php if (current_user_can('edit_users')) : ?>
+			<li class="menupop" onmouseover="showNav(this)" onmouseout="hideNav(this)">
+				<a href="<?php echo $wpurl; ?>/wp-admin/users.php"><span><?php _e('Users'); ?></span></a>
+				<ul>
+					<li><a href="<?php echo $wpurl; ?>/wp-admin/users.php"><?php _e('Authors &amp; Users'); ?></a></li>
+					<li><a href="<?php echo $wpurl; ?>/wp-admin/profile.php"><?php _e('Your Profile'); ?></a></li>
+				</ul>
+			</li>
+<?php else : ?>
+			<li><a href="<?php echo $wpurl; ?>/wp-admin/profile.php"><?php _e('Your Profile'); ?></a></li>
+<?php endif; ?>
 <?php if (current_user_can('manage_options')) : ?>
 			<li class="menupop" onmouseover="showNav(this)" onmouseout="hideNav(this)">
 				<a href="<?php echo $wpurl; ?>/wp-admin/options-general.php"><span><?php _e('Options'); ?></span></a>
@@ -89,7 +121,7 @@
 					<li><a href="<?php echo $wpurl; ?>/wp-admin/options-writing.php"><?php _e('Writing'); ?></a></li>
 					<li><a href="<?php echo $wpurl; ?>/wp-admin/options-reading.php"><?php _e('Reading'); ?></a></li>
 					<li><a href="<?php echo $wpurl; ?>/wp-admin/options-discussion.php"><?php _e('Discussion'); ?></a></li>
-<?php if ($wp_db_version >= '3790') { ?>					<li><a href="<?php echo $wpurl; ?>/wp-admin/options-privacy.php"><?php _e('Privacy'); ?></a></li><?php echo "\n"; } ?>
+					<li><a href="<?php echo $wpurl; ?>/wp-admin/options-privacy.php"><?php _e('Privacy'); ?></a></li>
 					<li><a href="<?php echo $wpurl; ?>/wp-admin/options-permalink.php"><?php _e('Permalinks'); ?></a></li>
 					<li><a href="<?php echo $wpurl; ?>/wp-admin/options-misc.php"><?php _e('Miscellaneous'); ?></a></li>
 <?php if (function_exists('wp_cache_manager')) { ?>					<li><a href="<?php echo $wpurl; ?>/wp-admin/options-general.php?page=wp-cache/wp-cache.php"><?php _e('WP-Cache'); ?></a></li><?php echo "\n"; } ?>
@@ -98,17 +130,6 @@
 				</ul>
 			</li>
 <?php endif; ?>
-<?php if (current_user_can('edit_users')) : ?>
-			<li class="menupop" onmouseover="showNav(this)" onmouseout="hideNav(this)">
-				<a href="<?php echo $wpurl; ?>/wp-admin/users.php"><span><?php _e('Users'); ?></span></a>
-				<ul>
-					<li><a href="<?php echo $wpurl; ?>/wp-admin/profile.php"><?php _e('Your Profile'); ?></a></li>
-					<li><a href="<?php echo $wpurl; ?>/wp-admin/users.php"><?php _e('Authors &amp; Users'); ?></a></li>
-				</ul>
-			</li>
-<?php else : ?>
-			<li><a href="<?php echo $wpurl; ?>/wp-admin/profile.php"><?php _e('Your Profile'); ?></a></li>
-<?php endif; ?>
 			<li><a href="<?php echo $wpurl; ?>/wp-login.php?action=logout&amp;redirect_to=<?php bloginfo('url'); ?>/"><?php _e('Sign Out'); ?></a></li>
 		</ul>
 	</div>