Fixing warnings in my moodle/ blocks /pagelib, plus moved page->edit_always to base class
This commit is contained in:
@@ -279,6 +279,9 @@ class block_base {
|
||||
$title = $this->str->show;
|
||||
}
|
||||
|
||||
if (empty($this->instance->pageid)) {
|
||||
$this->instance->pageid = 0;
|
||||
}
|
||||
$page = page_create_object($this->instance->pagetype, $this->instance->pageid);
|
||||
$script = $page->url_get_full(array('instanceid' => $this->instance->id, 'sesskey' => $USER->sesskey));
|
||||
|
||||
|
||||
+7
-9
@@ -251,6 +251,12 @@ function blocks_print_group(&$page, &$pageblocks, $position) {
|
||||
else {
|
||||
$maxweight = max(array_keys($pageblocks[$position]));
|
||||
}
|
||||
|
||||
foreach ($instances as $instance) {
|
||||
if (!empty($instance->pinned)) {
|
||||
$maxweight--;
|
||||
}
|
||||
}
|
||||
|
||||
$isediting = $page->user_is_editing();
|
||||
|
||||
@@ -266,9 +272,7 @@ function blocks_print_group(&$page, &$pageblocks, $position) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (method_exists($page,'edit_always')) {
|
||||
$editalways = $page->edit_always();
|
||||
}
|
||||
$editalways = $page->edit_always();
|
||||
|
||||
if (($isediting && empty($instance->pinned)) || !empty($editalways)) {
|
||||
$options = 0;
|
||||
@@ -314,12 +318,6 @@ function blocks_preferred_width(&$instances) {
|
||||
|
||||
$blocks = blocks_get_record();
|
||||
|
||||
foreach ($instances as $instance) {
|
||||
if (!empty($instance->pinned)) {
|
||||
$maxweight--;
|
||||
}
|
||||
}
|
||||
|
||||
foreach($instances as $instance) {
|
||||
if(!$instance->visible) {
|
||||
continue;
|
||||
|
||||
@@ -293,6 +293,12 @@ class page_base {
|
||||
function init_full() {
|
||||
$this->full_init_done = true;
|
||||
}
|
||||
|
||||
|
||||
// is this page always editable, regardless of anything else?
|
||||
function edit_always() {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user