Merge branch 'MDL-28185_m21' of git://github.com/stronk7/moodle into …

…MOODLE_21_STABLE
moodle · Jul 5, 2011 · d396a03 · d396a03
2 parents f404343 + f863214
commit d396a03
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
@@ -1854,7 +1854,7 @@ function xmldb_main_upgrade($oldversion) {
                                   WHERE ctx.id = bi.contextid)
                            ELSE bi.pagetypepattern END,
                        CASE WHEN bi.subpagepattern IS NULL
-                           THEN ''
+                           THEN '" . $DB->sql_empty() . "'
                            ELSE bi.subpagepattern END,
                        0, bi.defaultregion, bi.defaultweight
                   FROM {block_instances} bi