Merge branch 'MDL-50663' of https://github.com/sk-unikent/moodle into…

… MOODLE_29_STABLE
moodle · Jul 21, 2015 · 2d87c11 · 2d87c11
2 parents 106fd4f + 27478ec
commit 2d87c11
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/lib/blocklib.php b/lib/blocklib.php
@@ -578,7 +578,7 @@ public function load_blocks($includeinvisible = null) {
         }
 
         $context = $this->page->context;
-        $contexttest = 'bi.parentcontextid = :contextid2';
+        $contexttest = 'bi.parentcontextid IN (:contextid2, :contextid3)';
         $parentcontextparams = array();
         $parentcontextids = $context->get_parent_context_ids();
         if ($parentcontextids) {
@@ -594,12 +594,14 @@ public function load_blocks($includeinvisible = null) {
         $ccselect = ', ' . context_helper::get_preload_record_columns_sql('ctx');
         $ccjoin = "LEFT JOIN {context} ctx ON (ctx.instanceid = bi.id AND ctx.contextlevel = :contextlevel)";
 
+        $systemcontext = \context_system::instance();
         $params = array(
             'contextlevel' => CONTEXT_BLOCK,
             'subpage1' => $this->page->subpage,
             'subpage2' => $this->page->subpage,
             'contextid1' => $context->id,
             'contextid2' => $context->id,
+            'contextid3' => $systemcontext->id,
             'pagetype' => $this->page->pagetype,
         );
         if ($this->page->subpage === '') {

diff --git a/my/index.php b/my/index.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -104,11 +103,11 @@
 }
 
 // Toggle the editing state and switches
-if ($PAGE->user_allowed_editing()) {
+if (!$CFG->forcedefaultmymoodle && $PAGE->user_allowed_editing()) {
     if ($reset !== null) {
         if (!is_null($userid)) {
             require_sesskey();
-            if(!$currentpage = my_reset_page($userid, MY_PAGE_PRIVATE)){
+            if (!$currentpage = my_reset_page($userid, MY_PAGE_PRIVATE)) {
                 print_error('reseterror', 'my');
             }
             redirect(new moodle_url('/my'));

diff --git a/my/lib.php b/my/lib.php
@@ -58,7 +58,7 @@ function my_get_page($userid, $private=MY_PAGE_PRIVATE) {
 function my_copy_page($userid, $private=MY_PAGE_PRIVATE, $pagetype='my-index') {
     global $DB;
 
-    if ($customised = $DB->record_exists('my_pages', array('userid' => $userid, 'private' => $private))) {
+    if ($customised = $DB->get_record('my_pages', array('userid' => $userid, 'private' => $private))) {
         return $customised;  // We're done!
     }