--- drigg_ui.module	2008-11-07 02:00:12.000000000 +0100
+++ drigg_ui_new.module	2009-03-20 15:19:40.000000000 +0100
@@ -927,7 +927,7 @@ function drigg_ui_order_menu() {
  * @return
  *   The top menu
 */
-function drigg_ui_type_menu() {
+function drigg_ui_type_menu($promote, $type) {
   $output = '';
   $selected_string = ' class="active" ';
 
@@ -935,6 +935,17 @@ function drigg_ui_type_menu() {
   $p1 = arg(1);
   $p2 = arg(2);
 
+// added by munikho, makes sure menu is also on the nodeview
+  if ($promote == '0' && $type == 'drigg') {
+    $p0 = 'upcoming';
+  }
+  if ($promote == '1' && $type == 'drigg') {
+    $p0 = 'published';
+  }
+  if (arg(0) == 'node' && $type != 'drigg'){
+	$selected_string = '';
+  }
+
   // This will make sure that even the home page will work OK
   if ((arg(0) == 'node' || arg(0)== variable_get('drigg_home_name', 'drigg_home') ) && arg(1) == '' ) {
     $p0 = 'published';
@@ -949,9 +960,9 @@ function drigg_ui_type_menu() {
   }
 
   // This avoids doing anything if the URL is incorrect
-  if ($p0 != 'published' && $p0 != 'upcoming' && $p0 != 'archived') {
-    return '';
-  }
+//  if ($p0 != 'published' && $p0 != 'upcoming' && $p0 != 'archived') {
+//    return '';
+//  }
 
   // Hide the "archived" menu entry, UNLESS you _ARE_ in "archived"
   if (variable_get('drigg_hide_archived_menu', FALSE) && $p0 != 'archived') {