diff --git a/tools/recreate_conflicts.php b/tools/recreate_conflicts.php index cfc9420d75b..02b67b9842f 100755 --- a/tools/recreate_conflicts.php +++ b/tools/recreate_conflicts.php @@ -12,10 +12,10 @@ * @link https://www.github.com/aces/Loris/ */ -require_once __DIR__ . 'generic_includes.php'; +require_once __DIR__ . '/generic_includes.php'; $config = NDB_Config::singleton(); -$db = Database::singleton(); +$db = $lorisInstance->getDatabaseConnection(); /** * HELP SCREEN @@ -94,6 +94,7 @@ print "Recreating conflicts for " . $instrument['Test_name'] . ':'. $instrument['CommentID'] . "\n"; $diff = ConflictDetector::detectConflictsForCommentIds( + $lorisInstance, $instrument['Test_name'], $instrument['CommentID'], $instrument['DDECommentID']