commit 057ac99972150ab6c7e3dadb74938bc12b946197
Author: David Balch <david.balch@conted.ox.ac.uk>
Date:   Fri Mar 7 14:09:53 2014 +0000

    Tweak usqfiletypes for M2.5 (backport).

diff --git a/mod/assign/submission/usqfiletypes/classes/admin_setting_filetypes.php b/mod/assign/submission/usqfiletypes/classes/admin_setting_filetypes.php
index 9ded0ae..ce5dfcc 100644
--- a/mod/assign/submission/usqfiletypes/classes/admin_setting_filetypes.php
+++ b/mod/assign/submission/usqfiletypes/classes/admin_setting_filetypes.php
@@ -23,9 +23,14 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace assignsubmission_usqfiletypes;
+// Class autoloading is new in 2.6 (http://docs.moodle.org/dev/Automatic_class_loading)
+// Try importing manually
+require_once('filetypes_helper.php');
+require_once($CFG->dirroot.'/mod/assign/submissionplugin.php');
 
-use admin_setting, stdClass, html_writer;
+//namespace assignsubmission_usqfiletypes;
+
+// use admin_setting, stdClass, html_writer;
 
 /**
  * Administration interface for submission file type set settings.
diff --git a/mod/assign/submission/usqfiletypes/classes/filetypes_helper.php b/mod/assign/submission/usqfiletypes/classes/filetypes_helper.php
index fa08924..0d5efe1 100644
--- a/mod/assign/submission/usqfiletypes/classes/filetypes_helper.php
+++ b/mod/assign/submission/usqfiletypes/classes/filetypes_helper.php
@@ -23,7 +23,7 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace assignsubmission_usqfiletypes;
+//namespace assignsubmission_usqfiletypes;
 
 class filetypes_helper {
     private static $typesets = null;
diff --git a/mod/assign/submission/usqfiletypes/locallib.php b/mod/assign/submission/usqfiletypes/locallib.php
index e59ad07..591375b 100644
--- a/mod/assign/submission/usqfiletypes/locallib.php
+++ b/mod/assign/submission/usqfiletypes/locallib.php
@@ -24,6 +24,10 @@
  */
 defined('MOODLE_INTERNAL') || die();
 
+// Class autoloading is new in 2.6 (http://docs.moodle.org/dev/Automatic_class_loading)
+// Try importing manually
+require_once('classes/filetypes_helper.php');
+require_once($CFG->dirroot.'/mod/assign/submissionplugin.php');
 
 /**
  * Library class for file types submission plugin extending submission plugin base class
@@ -118,7 +122,8 @@ class assign_submission_usqfiletypes extends assign_submission_plugin {
                 $typesets[$extensions] = $description;
             }
         } else {
-            $helper = new assignsubmission_usqfiletypes\filetypes_helper();
+            //$helper = new assignsubmission_usqfiletypes\filetypes_helper();
+            $helper = new filetypes_helper();
             foreach ($helper->default_types() as $type) {
                 $typesets[$type->extensions] = $type->description;
             }
diff --git a/mod/assign/submission/usqfiletypes/settings.php b/mod/assign/submission/usqfiletypes/settings.php
index 3528629..7eba71d 100644
--- a/mod/assign/submission/usqfiletypes/settings.php
+++ b/mod/assign/submission/usqfiletypes/settings.php
@@ -23,5 +23,9 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-
-$settings->add(new \assignsubmission_usqfiletypes\admin_setting_filetypes());
+// Class autoloading is new in 2.6 (http://docs.moodle.org/dev/Automatic_class_loading)
+// Try importing manually
+require_once('locallib.php');
+require_once('classes/admin_setting_filetypes.php');
+$settings->add(new admin_setting_filetypes());
+//$settings->add(new \assignsubmission_usqfiletypes\admin_setting_filetypes());