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

Merge branch 'wip-MDL-35876-master' of git://github.com/phalacee/moodle

Browse Source 
Conflicts:
	lib/upgrade.txt
This commit is contained in:
Damyon Wiese
2013-03-27 10:06:30 +08:00
parent 3b597dd4ee 6671fa735a
commit df9bdfb000
7 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/blocklib.php
+2 -4
View File
@@ -945,8 +945,6 @@ class block_manager {
if ($first) {
$lastweight = $first->instance->weight - 2;
}
$strmoveblockhere = get_string('moveblockhere', 'block');
}
foreach ($instances as $instance) {
@@ -957,7 +955,7 @@ class block_manager {
if ($this->movingblock && $lastweight != $instance->instance->weight &&
$content->blockinstanceid != $this->movingblock && $lastblock != $this->movingblock) {
$results[] = new block_move_target($strmoveblockhere, $this->get_move_target_url($region, ($lastweight + $instance->instance->weight)/2));
$results[] = new block_move_target($this->get_move_target_url($region, ($lastweight + $instance->instance->weight)/2));
}
if ($content->blockinstanceid == $this->movingblock) {
@@ -972,7 +970,7 @@ class block_manager {
}
if ($this->movingblock && $lastblock != $this->movingblock) {
$results[] = new block_move_target($strmoveblockhere, $this->get_move_target_url($region, $lastweight + 1));
$results[] = new block_move_target($this->get_move_target_url($region, $lastweight + 1));
}
return $results;
}