From d7f688d46a9bbe23154f90d780ffc420c305dd2e Mon Sep 17 00:00:00 2001 From: tjhunt Date: Wed, 6 May 2009 08:56:44 +0000 Subject: [PATCH] moodle_page: MDL-12212 eliminate page::edit_always --- lib/blocklib.php | 9 +-------- lib/pagelib.php | 7 ------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/lib/blocklib.php b/lib/blocklib.php index 2f864206da..282e67092c 100644 --- 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 index e23e5241cb..abde579d0c 100644 --- a/lib/pagelib.php +++ b/lib/pagelib.php @@ -777,15 +777,8 @@ class page_base extends moodle_page { 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 * -- 2.39.5