Merged switchroles fixes from stable

diff --git a/lib/accesslib.php b/lib/accesslib.php
index cde7ab51fe4a779af22c12675c8d67810ff05620..308c350dae56c4f4f1d55bd14d2d1bab2cf0607a 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -616,12 +616,12 @@ function capability_search($capability, $context, $capabilities, $switchroleacti
 
         case CONTEXT_PERSONAL:
             $parentcontext = get_context_instance(CONTEXT_SYSTEM);
-            $permission = capability_search($capability, $parentcontext, $capabilities);
+            $permission = capability_search($capability, $parentcontext, $capabilities, $switchroleactive);
         break;
 
         case CONTEXT_USER:
             $parentcontext = get_context_instance(CONTEXT_SYSTEM);
-            $permission = capability_search($capability, $parentcontext, $capabilities);
+            $permission = capability_search($capability, $parentcontext, $capabilities, $switchroleactive);
         break;
 
         case CONTEXT_COURSECAT: // Coursecat -> coursecat or site
@@ -631,7 +631,7 @@ function capability_search($capability, $context, $capabilities, $switchroleacti
             } else { // else return site value
                 $parentcontext = get_context_instance(CONTEXT_SYSTEM);
             }
-            $permission = capability_search($capability, $parentcontext, $capabilities);
+            $permission = capability_search($capability, $parentcontext, $capabilities, $switchroleactive);
         break;
 
         case CONTEXT_COURSE: // 1 to 1 to course cat
@@ -643,20 +643,20 @@ function capability_search($capability, $context, $capabilities, $switchroleacti
                 } else {
                     $parentcontext = get_context_instance(CONTEXT_COURSECAT, $course->category);
                 }
-                $permission = capability_search($capability, $parentcontext, $capabilities);
+                $permission = capability_search($capability, $parentcontext, $capabilities, $switchroleactive);
             }
         break;
 
         case CONTEXT_GROUP: // 1 to 1 to course
             $courseid = groups_get_course($context->instanceid);
             $parentcontext = get_context_instance(CONTEXT_COURSE, $courseid);
-            $permission = capability_search($capability, $parentcontext, $capabilities);
+            $permission = capability_search($capability, $parentcontext, $capabilities, $switchroleactive);
         break;
 
         case CONTEXT_MODULE: // 1 to 1 to course
             $cm = get_record('course_modules','id',$context->instanceid);
             $parentcontext = get_context_instance(CONTEXT_COURSE, $cm->course);
-            $permission = capability_search($capability, $parentcontext, $capabilities);
+            $permission = capability_search($capability, $parentcontext, $capabilities, $switchroleactive);
         break;
 
         case CONTEXT_BLOCK: // not necessarily 1 to 1 to course
@@ -666,7 +666,7 @@ function capability_search($capability, $context, $capabilities, $switchroleacti
             } else {
                 $parentcontext = get_context_instance(CONTEXT_SYSTEM); 
             }           
-            $permission = capability_search($capability, $parentcontext, $capabilities);
+            $permission = capability_search($capability, $parentcontext, $capabilities, $switchroleactive);
         break;
 
         default: