mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 14:03:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-35265-master' of git://github.com/abgreeve/moodle

Browse Source 
Conflicts:
	version.php
This commit is contained in:
Aparup Banerjee 2012-10-16 10:46:11 +08:00
commit cb6b5fb625
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/db/upgrade.php
View File

@ -1244,5 +1244,21 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2012092600.00);
}
if ($oldversion < 2012101500.01) {
// Find all orphaned blog associations that might exist.
$sql = "SELECT ba.id
FROM {blog_association} ba
LEFT JOIN {post} p
ON p.id = ba.blogid
WHERE p.id IS NULL";
$orphanedrecordids = $DB->get_records_sql($sql);
// Now delete these associations.
foreach ($orphanedrecordids as $orphanedrecord) {
$DB->delete_records('blog_association', array('id' => $orphanedrecord->id));
}
upgrade_main_savepoint(true, 2012101500.01);
}
return true;
}

2
version.php
View File

@ -30,7 +30,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2012101500.00; // YYYYMMDD = weekly release date of this DEV branch
$version = 2012101500.01; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches
// .XX = incremental changes