moodle_page: MDL-12212 eliminate page::edit_always

robjoyce · May 6, 2009 · d7f688d · d7f688d
1 parent ad52c04
commit d7f688d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/lib/blocklib.php b/lib/blocklib.php
@@ -276,7 +276,7 @@ function blocks_print_group(&$page, &$pageblocks, $position) {
             $obj = $instance->obj;
         }
 
-        $editalways = $page->edit_always();
+        $editalways = false;
 
 
         if (($isediting  && empty($instance->pinned)) || !empty($editalways)) {
@@ -827,13 +827,6 @@ function blocks_get_pinned($page) {
     global $DB;
 
     $visible = true;
-
-    if (method_exists($page,'edit_always')) {
-        if ($page->edit_always()) {
-            $visible = false;
-        }
-    }
-
     $select = "pagetype = ?";
     $params = array($page->pagetype);
 

diff --git a/lib/pagelib.php b/lib/pagelib.php
@@ -777,15 +777,8 @@ function init_quick($data) {
     function init_full() {
         $this->full_init_done = true;
     }
-
-
-    // is this  page always editable, regardless of anything else?
-    function edit_always() {
-        return (has_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM)) &&  defined('ADMIN_STICKYBLOCKS'));
-    }
 }
 
-
 /**
  * Class that models the behavior of a moodle course
  *