mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-07-13 02:16:35 +02:00
Code Issues Projects Releases Wiki Activity

incorrect context used in rss_client block upgrade code MDL-6707 - part of the upgrade code is now rerun in existing installations - new upgrades should be ok, the cleanup of stale contexts and overrides will be done later as part on normal maintenance from cron

Browse Source
This commit is contained in:
skodak
2006-10-01 16:17:30 +00:00
parent 3832682229
commit a3627bb77d
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
blocks/rss_client/block_rss_client.php
View File

@ -19,7 +19,7 @@
function init() { function init() {
$this->title = get_string('feedstitle', 'block_rss_client'); $this->title = get_string('feedstitle', 'block_rss_client');
$this->version = 2006091100; $this->version = 2006100101;
} }
function preferred_width() { function preferred_width() {

13
blocks/rss_client/db/mysql.php
View File

@ -18,10 +18,10 @@ function rss_client_upgrade($oldversion) {
if ($oldversion < 2006091100) { if ($oldversion < 2006091100) {
// We need a new field to store whether an RSS feed is shared or private. // We need a new field to store whether an RSS feed is shared or private.
table_column('block_rss_client', '', 'shared', 'integer'); table_column('block_rss_client', '', 'shared', 'integer');
// Admin feeds used to be displayed to everybody (shared feeds). // Admin feeds used to be displayed to everybody (shared feeds).
$admins = get_admins(); $admins = get_admins();
if (!empty($admins)) { if (!empty($admins)) {
@ -42,7 +42,12 @@ function rss_client_upgrade($oldversion) {
} }
} }
} }
}
/// see MDL-6707 for more info about problem that was here
if ($oldversion < 2006100101) {
// Upgrade block to use the Roles System. // Upgrade block to use the Roles System.
$block = get_record('block', 'name', 'rss_client'); $block = get_record('block', 'name', 'rss_client');
@ -65,7 +70,7 @@ function rss_client_upgrade($oldversion) {
} }
foreach ($blockinstances as $bi) { foreach ($blockinstances as $bi) {
$context = get_context_instance(CONTEXT_MODULE, $bi->id); $context = get_context_instance(CONTEXT_BLOCK, $bi->id);
if ($bi->pagetype == 'course-view' && $bi->pageid == SITEID) { if ($bi->pagetype == 'course-view' && $bi->pageid == SITEID) {

11
blocks/rss_client/db/postgres7.php
View File

@ -20,10 +20,10 @@ function rss_client_upgrade($oldversion) {
if ($oldversion < 2006091100) { if ($oldversion < 2006091100) {
// We need a new field to store whether an RSS feed is shared or private. // We need a new field to store whether an RSS feed is shared or private.
table_column('block_rss_client', '', 'shared', 'integer'); table_column('block_rss_client', '', 'shared', 'integer');
// Admin feeds used to be displayed to everybody (shared feeds). // Admin feeds used to be displayed to everybody (shared feeds).
$admins = get_admins(); $admins = get_admins();
if (!empty($admins)) { if (!empty($admins)) {
@ -44,6 +44,11 @@ function rss_client_upgrade($oldversion) {
} }
} }
} }
}
/// see MDL-6707 for more info about problem that was here
if ($oldversion < 2006100101) {
// Upgrade block to use the Roles System. // Upgrade block to use the Roles System.
$block = get_record('block', 'name', 'rss_client'); $block = get_record('block', 'name', 'rss_client');
@ -67,7 +72,7 @@ function rss_client_upgrade($oldversion) {
} }
foreach ($blockinstances as $bi) { foreach ($blockinstances as $bi) {
$context = get_context_instance(CONTEXT_MODULE, $bi->id); $context = get_context_instance(CONTEXT_BLOCK, $bi->id);
if ($bi->pagetype == 'course-view' && $bi->pageid == SITEID) { if ($bi->pagetype == 'course-view' && $bi->pageid == SITEID) {