Index: lib/accesslib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/accesslib.php,v
retrieving revision 1.639
diff -u -r1.639 accesslib.php
--- lib/accesslib.php	20 May 2010 07:53:48 -0000	1.639
+++ lib/accesslib.php	20 May 2010 11:48:57 -0000
@@ -3411,6 +3411,9 @@
         }
     }
     foreach($alldefs as $name=>$def) {
+        if (isset($def['archetypes'][$archetype])) {
+            $defaults[$name] = $def['archetypes'][$archetype];
+        }
         if (isset($def['legacy'][$archetype])) {
             $defaults[$name] = $def['legacy'][$archetype];
         }
@@ -3527,6 +3530,8 @@
                 }
             }
         // we ignore legacy key if we have cloned permissions
+        } else if (isset($capdef['archetypes']) && is_array($capdef['archetypes'])) {
+            assign_legacy_capabilities($capname, $capdef['archetypes']);
         } else if (isset($capdef['legacy']) && is_array($capdef['legacy'])) {
             assign_legacy_capabilities($capname, $capdef['legacy']);
         }