Merge pull request #435 from turnitin/develop

Fix for upgrade

Author: dwinn

README.md

@@ -12,7 +12,7 @@ If you are having issues, please consult our [TROUBLE SHOOTING](https://github.c
 Installation
 ------------
 
-Before installing this plugin firstly make sure you are logged in as an Administrator and that you are using Moodle 2.7 or higher.
+Before installing this plugin firstly make sure you are logged in as an Administrator and that you are using Moodle 3.1 or higher.
 
 The Plagiarism Plugin can be used within the following Moodle modules:
 
@@ -24,6 +24,6 @@ To install, you need to copy all the files into the plagiarism/turnitin director
 
 Plagiarism plugins also need to be enabled before this plugin can be used. You can do this by going to `"Site Administration" > "Advanced Features"` and ticking the "Enable plagiarism plugins" box before saving.
 
-The Plagiarism Plugin will inherit connection settings from the turnitintooltwo module, but you can set default values and whether the plugin is enabled within Moodle modules by going to `"Site Administration" > "Plugins" > "Plagiarism prevention" > "Turnitin plagiarism plugin"`.
+You can set default values and whether the plugin is enabled within Moodle modules by going to `"Site Administration" > "Plugins" > "Plagiarism prevention" > "Turnitin plagiarism plugin"`.
 
 To create/update assignments, process submissions and update grades your moodle environment will need to have cron job running regularly. For information on how to do this please consult http://docs.moodle.org/26/en/Cron.

db/upgrade.php

@@ -21,6 +21,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
+require_once($CFG->dirroot.'/plagiarism/turnitin/lib.php');
+
 /**
  * @global moodle_database $DB
  * @param int $oldversion
@@ -292,7 +294,7 @@ function xmldb_plagiarism_turnitin_upgrade($oldversion) {
         // If V2 is installed, copy the settings across to PP.
         if ($DB->get_record('config_plugins', array('plugin' => 'mod_turnitintooltwo'))) {
             // Get the settings for the V2 plugin.
-            $data = turnitintooltwo_admin_config();
+            $data = get_config('turnitintooltwo');
 
             $properties = array("accountid", "secretkey", "apiurl", "enablediagnostic", "usegrademark",
                 "enablepeermark", "useerater", "transmatch", "repositoryoption", "agreement", "enablepseudo", "pseudofirstname",