Index: temp_moodle_dev/moodle/lib/datalib.php
===================================================================
diff -u -r3f2d9a6272fe3e770fbefee32fb8bb611fdaae49 -rc3addab405f3a6e27ffcc56049b9dfc97c3caf23
--- temp_moodle_dev/moodle/lib/datalib.php	(.../datalib.php)	(revision 3f2d9a6272fe3e770fbefee32fb8bb611fdaae49)
+++ temp_moodle_dev/moodle/lib/datalib.php	(.../datalib.php)	(revision c3addab405f3a6e27ffcc56049b9dfc97c3caf23)
@@ -1725,7 +1725,8 @@
                                             cm.instance = m.id AND
                                             cm.section = cw.id AND
                                             md.name = '$modulename' AND
-                                            md.id = cm.module")) {
+                                            md.id = cm.module".(($modulename=="quiz"||$modulename=="choice"||$modulename=="glossary")?" AND m.is_lams = 0":""))) { // to show just activities that are created outside Lams
+										    //old md.id = cm.module")) { 
         return $outputarray;
     }
 
Index: temp_moodle_dev/moodle/mod/choice/index.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -rc3addab405f3a6e27ffcc56049b9dfc97c3caf23
--- temp_moodle_dev/moodle/mod/choice/index.php	(.../index.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/choice/index.php	(.../index.php)	(revision c3addab405f3a6e27ffcc56049b9dfc97c3caf23)
@@ -23,7 +23,7 @@
 
  	//m
      //if (! $choices = get_all_instances_in_course("choice", $course)) {
-    if (! $choices = get_all_instances_in_course("choice", "$course  and is_lams=0")) {
+    if (! $choices = get_all_instances_in_course("choice", $course)) {
         notice(get_string('thereareno', 'moodle', $strchoices), "../../course/view.php?id=$course->id");
     }