Merge branch 'mdl44499-moodle25' of https://github.com/tlock/moodle into MOODLE_25_STABLE

2014-03-18 14:27:02 +13:00
parent cadca2ab9a a2e726382a
commit 069b3ae29c
1 changed files with 1 additions and 0 deletions
@@ -94,6 +94,7 @@ class upload_manager {
            $course = $SITE;
        }

+        $this->config = new stdClass();
        $this->config->deleteothers = $deleteothers;
        $this->config->handlecollisions = $handlecollisions;
        $this->config->recoverifmultiple = $recoverifmultiple;