Merge branch 'MDL-50049-master' of git://github.com/ankitagarwal/moodle

admin/tool/generator/lib.php

@@ -53,7 +53,7 @@ function tool_generator_pluginfile($course, $cm, $context, $filearea, $args, $fo
     $file = $fs->get_file($context->id, 'tool_generator', $filearea, $args[0], '/', $args[1]);
 
     // Send the file, always forcing download, we don't want options.
-    session_get_instance()->write_close();
+    \core\session\manager::write_close();
     send_stored_file($file, 0, 0, true);
 }
 

admin/tool/phpunit/webrunner.php

@@ -35,7 +35,7 @@ navigation_node::override_active_url(new moodle_url('/admin/tool/phpunit/index.p
 admin_externalpage_setup('toolphpunitwebrunner');
 
 if (!$CFG->debugdeveloper) {
-    error('Not available on production sites, sorry.');
+    print_error('notlocalisederrormessage', 'error', '', null, 'Not available on production sites, sorry.');
 }
 
 core_php_time_limit::raise(60*30);