Merge branch 'MDL-41421_master' of git://github.com/dmonllao/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 25 Sep 2013 01:53:48 +0000 (11:53 +1000)
committerMarina Glancy <marina@moodle.com>
Wed, 25 Sep 2013 01:53:48 +0000 (11:53 +1000)
1  2 
admin/tool/generator/classes/course_backend.php
admin/tool/generator/version.php
config-dist.php

@@@ -108,9 -108,18 +108,18 @@@ class tool_generator_course_backend ext
          // Set parameters.
          $this->shortname = $shortname;
  
 -        parent::__construct($size, $fixeddataset, $progress);
 +        parent::__construct($size, $fixeddataset, $filesizelimit, $progress);
      }
  
+     /**
+      * Returns the relation between users and course sizes.
+      *
+      * @return array
+      */
+     public static function get_users_per_size() {
+         return self::$paramusers;
+     }
      /**
       * Gets a list of size choices supported by this backend.
       *
@@@ -24,6 -24,6 +24,6 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $plugin->version = 2013091200;
 -$plugin->version = 2013090500;
 -$plugin->requires = 2013090500;
++$plugin->version = 2013091201;
 +$plugin->requires = 2013090200;
  $plugin->component = 'tool_generator';
diff --cc config-dist.php
Simple merge