--- lib.php	2008-12-27 22:34:39.000000000 +0200
+++ lib.php.new	2009-05-07 16:48:13.000000000 +0300
@@ -1463,10 +1480,12 @@
 
     static $resources = false;
     static $activities = false;
+    static $resourcestivities = false;
 
-    if ($resources === false) { 
+    if ($resources === false) {
         $resources = array();
         $activities = array();
+	$resourcestivities = array();
 
         foreach($modnames as $modname=>$modnamestr) {
             if (!course_allowed_module($course, $modname)) {
@@ -1491,16 +1510,19 @@
                     } else {
                         $activities[$type->type] = $type->typestr;
                     }
+		    $resourcestivities[$type->type] = $type->typestr;
                 }
             } else {
                 // all mods without type are considered activity
                 $activities[$modname] = $modnamestr;
             }
+	    $resourcestivities[$modname] =  $modnamestr;
         }
     }
 
     $straddactivity = get_string('addactivity');
     $straddresource = get_string('addresource');
+    $straddresourcestivities = get_string('addresourcestivities','resource');
 
     $output  = '<div class="section_add_menus">';
 
@@ -1508,17 +1530,24 @@
         $output .= '<div class="horizontal">';
     }
 
-    if (!empty($resources)) {
-        $output .= popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&amp;section=$section&amp;sesskey=".sesskey()."&amp;add=",
-                              $resources, "ressection$section", "", $straddresource, 'resource/types', $straddresource, true);
-    }
+    if ($CFG->addresourcestivities_enable) {
+      if (!empty($resourcestivities)) {
+	    $output .= popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&amp;section=$section&amp;sesskey=".sesskey()."&amp;add=",
+				  $resourcestivities, "ressection$section", "", $straddresourcestivities, 'resource/types', $straddresourcestivities, true);
+	}
 
-    if (!empty($activities)) {
-        $output .= ' ';
-        $output .= popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&amp;section=$section&amp;sesskey=".sesskey()."&amp;add=",
-                    $activities, "section$section", "", $straddactivity, 'mods', $straddactivity, true);
-    }
+    } else {
+	if (!empty($resources)) {
+	    $output .= popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&amp;section=$section&amp;sesskey=".sesskey()."&amp;add=",
+				  $resources, "ressection$section", "", $straddresource, 'resource/types', $straddresource, true);
+	}
 
+	if (!empty($activities)) {
+	    $output .= ' ';
+	    $output .= popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&amp;section=$section&amp;sesskey=".sesskey()."&amp;add=",
+			$activities, "section$section", "", $straddactivity, 'mods', $straddactivity, true);
+	}
+    }
     if (!$vertical) {
         $output .= '</div>';
     }