Merge branch 'MDL-28185_master' of git://github.com/stronk7/moodle

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 271fb12..397f045 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -1854,7 +1854,7 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
                                   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