L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blocks: MDL-19010 Fix further blocks-related breakage, including removing all references to blocks_insance_old outside blocklib.php

Browse Source
This commit is contained in:
tjhunt
2009-05-07 08:55:10 +00:00
parent 572befbcf2
commit f474a4e583
16 changed files with 154 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/blocks.php
+3 -3
View File
@@ -82,7 +82,7 @@
}
// First delete instances and then block
$instances = $DB->get_records('block_instance_old', array('blockid'=>$block->id));
$instances = $DB->get_records('block_instances', array('blockname' => $block->name));
if(!empty($instances)) {
foreach($instances as $instance) {
blocks_delete_instance($instance);
@@ -168,8 +168,8 @@
// MDL-11167, blocks can be placed on mymoodle, or the blogs page
// and it should not show up on course search page
$totalcount = $DB->count_records('block_instance_old', array('blockid'=>$blockid));
$count = $DB->count_records('block_instance_old', array('blockid'=>$blockid, 'pagetype'=>'course-view'));
$totalcount = $DB->count_records('block_instances', array('blockname'=>$blockname));
$count = $DB->count_records('block_instances', array('blockname'=>$blockname, 'pagetypepattern'=>'course-view-*'));
if ($count>0) {
$blocklist = "<a href=\"{$CFG->wwwroot}/course/search.php?blocklist=$blockid&amp;sesskey=".sesskey()."\" ";