Merge "Bug 1814954: Getting "Undefined index: artefactid" on upgrade"

473be679 · Cecilia Vela Gurovic · Gerrit Code Review · f76acb0b · ddd0ac8a · 473be679
Commit 473be679 authored Feb 12, 2019 by Cecilia Vela Gurovic Committed by Gerrit Code Review Feb 12, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

upgrade.php htdocs/lib/db/upgrade.php +2 -1

No files found.
--- a/htdocs/lib/db/upgrade.php
+++ b/htdocs/lib/db/upgrade.php
@@ -890,7 +890,8 @@ function xmldb_core_upgrade($oldversion=0) {
                    $configdata['artefactids'] = array($configdata['artefactid']);
                    unset($configdata['artefactid']);
                }
-                else if (is_null($configdata['artefactid'])) {
+                else if (array_key_exists('artefactid', $configdata)) {
+                    // Key exists and value is NULL
                    $configdata['artefactids'] = array();
                    unset($configdata['artefactid']);
                }