Merge branch 'MDL-41827_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2013 00:38:34 +0000 (02:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2013 00:38:34 +0000 (02:38 +0200)
Conflicts:
admin/tool/generator/classes/site_backend.php

1  2 
admin/tool/generator/classes/site_backend.php
admin/tool/generator/cli/maketestcourse.php
admin/tool/generator/cli/maketestsite.php

@@@ -90,8 -93,8 +93,8 @@@ if ($error = tool_generator_course_back
  }
  
  // Switch to admin user account.
 -session_set_user(get_admin());
 +\core\session\manager::set_user(get_admin());
  
  // Do backend code to generate course.
- $backend = new tool_generator_course_backend($shortname, $size, $fixeddataset, empty($options['quiet']));
+ $backend = new tool_generator_course_backend($shortname, $size, $fixeddataset, $filesizelimit, empty($options['quiet']));
  $id = $backend->make();
@@@ -88,8 -91,8 +91,8 @@@ try 
  }
  
  // Switch to admin user account.
 -session_set_user(get_admin());
 +\core\session\manager::set_user(get_admin());
  
  // Do backend code to generate site.
- $backend = new tool_generator_site_backend($size, $options['bypasscheck'], $fixeddataset, empty($options['quiet']));
+ $backend = new tool_generator_site_backend($size, $options['bypasscheck'], $fixeddataset, $filesizelimit, empty($options['quiet']));
  $backend->make();