Skip to content
Permalink
Browse files
Merge branch 'MDL-65207-master' of git://github.com/lameze/moodle
  • Loading branch information
David Monllaó committed Apr 24, 2019
2 parents 45c8b22 + 9bec0e7 commit 03876f0b89443bcab5354a872269e59ab9f46f3f
@@ -5269,7 +5269,7 @@ protected function process_question_attempt_step($data) {
}

/**
* This method does the acutal work for process_question_usage or
* This method does the actual work for process_question_usage or
* process_{nameprefix}_question_usage.
* @param array $data the data from the XML file.
* @param string $nameprefix the element name prefix.
@@ -5304,7 +5304,7 @@ protected function restore_question_usage_worker($data, $nameprefix) {
abstract protected function inform_new_usage_id($newusageid);

/**
* This method does the acutal work for process_question_attempt or
* This method does the actual work for process_question_attempt or
* process_{nameprefix}_question_attempt.
* @param array $data the data from the XML file.
* @param string $nameprefix the element name prefix.
@@ -5334,7 +5334,7 @@ protected function restore_question_attempt_worker($data, $nameprefix) {
}

/**
* This method does the acutal work for process_question_attempt_step or
* This method does the actual work for process_question_attempt_step or
* process_{nameprefix}_question_attempt_step.
* @param array $data the data from the XML file.
* @param string $nameprefix the element name prefix.
@@ -33,7 +33,7 @@
/**
* Tests for encoding content links in backup_course_task.
*
* The code that this tests is acutally in backup/moodle2/backup_course_task.class.php,
* The code that this tests is actually in backup/moodle2/backup_course_task.class.php,
* but there is no place for unit tests near there, and perhaps one day it will
* be refactored so it becomes more generic.
*/
@@ -32,7 +32,7 @@
/**
* Unit tests for filter_algebra.
*
* Note that this only tests some of the filter logic. It does not acutally test
* Note that this only tests some of the filter logic. It does not actually test
* the normal case of the filter working, because I cannot make it work on my
* test server, and if it does not work here, it probably does not also work
* for other people. A failing test will be irritating noise.
@@ -10720,7 +10720,7 @@ window.tinymce.dom.Sizzle = Sizzle;

// Nodes needs to be attached to something in WebKit/Opera
// Older builds of Opera crashes if you attach the node to an document created dynamically
// and since we can't feature detect a crash we need to sniff the acutal build number
// and since we can't feature detect a crash we need to sniff the actual build number
// This fix will make DOM ranges and make Sizzle happy!
impl = node.ownerDocument.implementation;
if (impl.createHTMLDocument) {
@@ -659,7 +659,7 @@ function question_move_question_tags_to_new_context(array $questions, context $n
/**
* This function should be considered private to the question bank, it is called from
* question/editlib.php question/contextmoveq.php and a few similar places to to the
* work of acutally moving questions and associated data. However, callers of this
* work of actually moving questions and associated data. However, callers of this
* function also have to do other work, which is why you should not call this method
* directly from outside the questionbank.
*
@@ -34,7 +34,7 @@
* want to say that access is allowed, or explain the reason why it is block.
* Therefore instead of is_access_allowed(...) we have prevent_access(...) that
* return false if access is permitted, or a string explanation (which is treated
* as true) if access should be blocked. Slighly unnatural, but acutally the easist
* as true) if access should be blocked. Slighly unnatural, but actually the easiest
* way to implement this.
*
* @copyright 2009 Tim Hunt
@@ -285,7 +285,7 @@ protected function process_quiz_question_instance($data) {

if (!property_exists($data, 'slot')) {
// There was a question_instance in the backup file for a question
// that was not acutally in the quiz. Drop it.
// that was not actually in the quiz. Drop it.
$this->log('question ' . $data->questionid . ' was associated with quiz ' .
$this->get_new_parentid('quiz') . ' but not actually used. ' .
'The instance has been ignored.', backup::LOG_INFO);
@@ -54,7 +54,7 @@
* - For the last part, they were wrong at the last try, so 0/3.
* So, total mark is 6/12. (Really, a fraction of 0.5.)
*
* Of course, the details of the grading are acutally up to the particular
* Of course, the details of the grading are actually up to the particular
* question type. The point is that the final grade can take into account all
* of the tries the student made.
*
@@ -519,7 +519,7 @@ public function response_summary_changed() {

/**
* If as a result of processing this step, you identify that this variant of the
* question is acutally identical to the another one, you may change the
* question is actually identical to the another one, you may change the
* variant number recorded, in order to give better statistics. For an example
* see qbehaviour_opaque.
* @param int $variant the new variant number.
@@ -571,7 +571,7 @@ public function set_behaviour_var($name, $value) {
/**
* A null {@link question_attempt_step} returned from
* {@link question_attempt::get_last_step()} etc. when a an attempt has just been
* created and there is no acutal step.
* created and there is no actual step.
*
* @copyright 2009 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -16,7 +16,7 @@

/**
* This file contains test helper code for testing the upgrade to the new
* question engine. The acutal tests are organised by question type in files
* question engine. The actual tests are organised by question type in files
* like question/type/truefalse/tests/upgradelibnewqe_test.php.
*
* @package moodlecore
@@ -261,7 +261,7 @@
// Ensure we redirect back to the category the question is being saved into.
$returnurl->param('category', $fromform->category);

// We are acutally saving the question.
// We are actually saving the question.
if (!empty($question->id)) {
question_require_capability_on($question, 'edit');
} else {

0 comments on commit 03876f0

Please sign in to comment.