Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

[tools] Fix path in recreate_conflict #8292

Merged
merged 1 commit into from
Jan 12, 2023
Merged

[tools] Fix path in recreate_conflict #8292

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions tools/recreate_conflicts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
* @link https://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
Expand Down Expand Up @@ -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']
Expand Down