--- wpcom_adminbar.php.orig	2006-10-11 22:32:14.000000000 +0100
+++ wpcom_adminbar.php	2007-01-24 09:54:20.000000000 +0000
@@ -34,7 +34,21 @@
 <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
 	?>
@@ -59,8 +73,12 @@
 	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";
 	}
+	// akismet 1.5
 	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";
+		?>				<li><a href="<?php echo $wpurl; ?>/wp-admin/edit.php?page=akismet-admin.php"><?php echo sprintf(__('Akismet Spam (%s)'), ksd_spam_count()); ?></a></li><?php echo "\n";
+	// akismet 2.0
+	} else if ((function_exists('akismet_spam_count'))) {
+		?>				<li><a href="<?php echo $wpurl; ?>/wp-admin/edit.php?page=akismet-admin"><?php echo sprintf(__('Akismet Spam (%s)'), akismet_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";
@@ -76,6 +94,17 @@
 				</ul>
 			</li>
 <?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('Links'); ?></span></a>
+		<ul>
+			<li><a href="<?php echo $wpurl; ?>/wp-admin/link-manager.php"><?php _e('Manage Links'); ?></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-categories.php"><?php _e('Link Categories'); ?></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">