Merge branch 'MDL-33073-master-1' of git://git.luns.net.uk/moodle

diff --git a/course/format/renderer.php b/course/format/renderer.php
index 25e0b35..63f3bdc 100644 (file)
--- a/course/format/renderer.php
+++ b/course/format/renderer.php
@@ -547,6 +547,11 @@ abstract class format_section_renderer_base extends plugin_renderer_base {
             } else {
                 // This will create a course section if it doesn't exist..
                 $thissection = get_course_section($section, $course->id);
+
+                // The returned section is only a bare database object rather than
+                // a section_info object - we will need at least the uservisible
+                // field in it.
+                $thissection->uservisible = true;
             }
             // Show the section if the user is permitted to access it, OR if it's not available
             // but showavailability is turned on

diff --git a/course/lib.php b/course/lib.php
index 2c6c0e5..f0a597f 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -2752,8 +2752,10 @@ function get_course_section($section, $courseid) {
     $cw->summaryformat = FORMAT_HTML;
     $cw->sequence = "";
     $id = $DB->insert_record("course_sections", $cw);
+    rebuild_course_cache($courseid, true);
     return $DB->get_record("course_sections", array("id"=>$id));
 }
+
 /**
  * Given a full mod object with section and course already defined, adds this module to that section.
  *

diff --git a/index.php b/index.php
index 03cb058..a27a4ed 100644 (file)
--- a/index.php
+++ b/index.php
@@ -77,7 +77,7 @@
     }
 
 /// If the hub plugin is installed then we let it take over the homepage here
-    if (get_config('local_hub', 'hubenabled') && file_exists($CFG->dirroot.'/local/hub/lib.php')) {
+    if (file_exists($CFG->dirroot.'/local/hub/lib.php') and get_config('local_hub', 'hubenabled')) {
         require_once($CFG->dirroot.'/local/hub/lib.php');
         $hub = new local_hub();
         $continue = $hub->display_homepage();

diff --git a/lang/en/question.php b/lang/en/question.php
index 74edbbc..d0cf1a4 100644 (file)
--- a/lang/en/question.php
+++ b/lang/en/question.php
@@ -269,6 +269,7 @@ $string['questiontype'] = 'Question type';
 $string['questionuse'] = 'Use question in this activity';
 $string['questionvariant'] = 'Question variant';
 $string['reviewresponse'] = 'Review response';
+$string['save'] = 'Save';
 $string['saveflags'] = 'Save the state of the flags';
 $string['selectacategory'] = 'Select a category:';
 $string['selectaqtypefordescription'] = 'Select a question type to see its description.';
@@ -298,7 +299,7 @@ $string['answer'] = 'Answer';
 $string['answersaved'] = 'Answer saved';
 $string['attemptfinished'] = 'Attempt finished';
 $string['attemptfinishedsubmitting'] = 'Attempt finished submitting: ';
-$string['behaviourbeingused'] = 'behaviour being used: {$a}';
+$string['behaviourbeingused'] = 'Behaviour being used: {$a}';
 $string['cannotloadquestion'] = 'Could not load question';
 $string['cannotpreview'] = 'You can\'t preview these questions!';
 $string['category'] = 'Category';
@@ -403,6 +404,12 @@ $string['submissionoutofsequencefriendlymessage'] = "You have entered data outsi
 $string['submit'] = 'Submit';
 $string['submitandfinish'] = 'Submit and finish';
 $string['submitted'] = 'Submit: {$a}';
+$string['technicalinfo'] = 'Technical information';
+$string['technicalinfo_help'] = 'This technical information is probably only useful for developers working on new question types. It may also be helpful when trying to diagnose problems with questions.';
+$string['technicalinfominfraction'] = 'Minimum fraction: {$a}';
+$string['technicalinfoquestionsummary'] = 'Question summary: {$a}';
+$string['technicalinforightsummary'] = 'Right answer summary: {$a}';
+$string['technicalinfostate'] = 'Question state: {$a}';
 $string['unknownbehaviour'] = 'Unknown behaviour: {$a}.';
 $string['unknownquestion'] = 'Unknown question: {$a}.';
 $string['unknownquestioncatregory'] = 'Unknown question category: {$a}.';

diff --git a/lib/setuplib.php b/lib/setuplib.php
index 97ae95e..2c471f6 100644 (file)
--- a/lib/setuplib.php
+++ b/lib/setuplib.php
@@ -1097,7 +1097,7 @@ function disable_output_buffering() {
  */
 function redirect_if_major_upgrade_required() {
     global $CFG;
-    $lastmajordbchanges = 2010111700;
+    $lastmajordbchanges = 2012051700;
     if (empty($CFG->version) or (int)$CFG->version < $lastmajordbchanges or
             during_initial_install() or !empty($CFG->adminsetuppending)) {
         try {

diff --git a/question/preview.php b/question/preview.php
index 8b62e43..56513e7 100644 (file)
--- a/question/preview.php
+++ b/question/preview.php
@@ -132,7 +132,7 @@ $optionsform->set_data($options);
 
 // Process change of settings, if that was requested.
 if ($newoptions = $optionsform->get_submitted_data()) {
-    // Set user preferences
+    // Set user preferences.
     $options->save_user_preview_options($newoptions);
     if (!isset($newoptions->variant)) {
         $newoptions->variant = $options->variant;
@@ -205,22 +205,32 @@ if ($question->length) {
 } else {
     $displaynumber = 'i';
 }
-$restartdisabled = '';
-$finishdisabled = '';
-$filldisabled = '';
+$restartdisabled = array();
+$finishdisabled = array();
+$filldisabled = array();
 if ($quba->get_question_state($slot)->is_finished()) {
-    $finishdisabled = ' disabled="disabled"';
-    $filldisabled = ' disabled="disabled"';
+    $finishdisabled = array('disabled' => 'disabled');
+    $filldisabled = array('disabled' => 'disabled');
 }
 // If question type cannot give us a correct response, disable this button.
 if (is_null($quba->get_correct_response($slot))) {
-    $filldisabled = ' disabled="disabled"';
+    $filldisabled = array('disabled' => 'disabled');
 }
 if (!$previewid) {
-    $restartdisabled = ' disabled="disabled"';
+    $restartdisabled = array('disabled' => 'disabled');
 }
 
-// Output
+// Prepare technical info to be output.
+$qa = $quba->get_question_attempt($slot);
+$technical = array();
+$technical[] = get_string('behaviourbeingused', 'question',
+        question_engine::get_behaviour_name($qa->get_behaviour_name()));
+$technical[] = get_string('technicalinfominfraction',     'question', $qa->get_min_fraction());
+$technical[] = get_string('technicalinfoquestionsummary', 'question', s($qa->get_question_summary()));
+$technical[] = get_string('technicalinforightsummary',    'question', s($qa->get_right_answer_summary()));
+$technical[] = get_string('technicalinfostate',           'question', '' . $qa->get_state());
+
+// Start output.
 $title = get_string('previewquestion', 'question', format_string($question->name));
 $headtags = question_engine::initialise_js() . $quba->render_question_head_html($slot);
 $PAGE->set_title($title);
@@ -228,30 +238,38 @@ $PAGE->set_heading($title);
 echo $OUTPUT->header();
 
 // Start the question form.
-echo '<form method="post" action="' . $actionurl .
-        '" enctype="multipart/form-data" id="responseform">', "\n";
-echo '<div>';
-echo '<input type="hidden" name="sesskey" value="' . sesskey() . '" />', "\n";
-echo '<input type="hidden" name="slots" value="' . $slot . '" />', "\n";
-echo '</div>';
+echo html_writer::start_tag('form', array('method' => 'post', 'action' => $actionurl,
+        'enctype' => 'multipart/form-data', 'id' => 'responseform'));
+echo html_writer::start_tag('div');
+echo html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'sesskey', 'value' => sesskey()));
+echo html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'slots', 'value' => $slot));
+echo html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'scrollpos', 'value' => '', 'id' => 'scrollpos'));
+echo html_writer::end_tag('div');
 
 // Output the question.
 echo $quba->render_question($slot, $options, $displaynumber);
 
-echo '<p class="notifytiny">' . get_string('behaviourbeingused', 'question',
-        question_engine::get_behaviour_name(
-        $quba->get_question_attempt($slot)->get_behaviour_name())) . '</p>';
 // Finish the question form.
-echo '<div id="previewcontrols" class="controls">';
-echo '<input type="submit" name="restart"' . $restartdisabled .
-        ' value="' . get_string('restart', 'question') . '" />', "\n";
-echo '<input type="submit" name="fill"' . $filldisabled .
-        ' value="' . get_string('fillincorrect', 'question') . '" />', "\n";
-echo '<input type="submit" name="finish"' . $finishdisabled .
-        ' value="' . get_string('submitandfinish', 'question') . '" />', "\n";
-echo '<input type="hidden" name="scrollpos" id="scrollpos" value="" />';
-echo '</div>';
-echo '</form>';
+echo html_writer::start_tag('div', array('id' => 'previewcontrols', 'class' => 'controls'));
+echo html_writer::empty_tag('input', $restartdisabled + array('type' => 'submit',
+        'name' => 'restart', 'value' => get_string('restart', 'question')));
+echo html_writer::empty_tag('input', $finishdisabled  + array('type' => 'submit',
+        'name' => 'save',    'value' => get_string('save', 'question')));
+echo html_writer::empty_tag('input', $filldisabled    + array('type' => 'submit',
+        'name' => 'fill',    'value' => get_string('fillincorrect', 'question')));
+echo html_writer::empty_tag('input', $finishdisabled  + array('type' => 'submit',
+        'name' => 'finish',  'value' => get_string('submitandfinish', 'question')));
+echo html_writer::end_tag('div');
+echo html_writer::end_tag('form');
+
+// Output the technical info.
+print_collapsible_region_start('', 'techinfo', get_string('technicalinfo', 'question') .
+        $OUTPUT->help_icon('technicalinfo', 'question'),
+        'core_question_preview_techinfo_collapsed', true);
+foreach ($technical as $info) {
+    echo html_writer::tag('p', $info, array('class' => 'notifytiny'));
+}
+print_collapsible_region_end();
 
 // Display the settings form.
 $optionsform->display();

diff --git a/theme/base/style/question.css b/theme/base/style/question.css
index 91e847c..d974e50 100644 (file)
--- a/theme/base/style/question.css
+++ b/theme/base/style/question.css
@@ -87,6 +87,10 @@ body.jsenabled #qtypechoicecontainer {display: block;}
 .importerror {margin-top: 10px;border-bottom: 1px solid #555;}
 .mform .que.comment .fitemtitle {width: 20%;}
 
+#page-question-preview #techinfo {
+    margin: 1em 0;
+}
+
 /** Overide for RTL layout **/
 .dir-rtl #qtypechoicecontainer #chooseqtype .instruction,
 .dir-rtl #qtypechoicecontainer #chooseqtype .qtypesummary {right: 60%;left: 0%; border-left:0;border-right: 1px solid grey;}

diff --git a/user/filesedit.php b/user/filesedit.php
index ab34eef..716456e 100644 (file)
--- a/user/filesedit.php
+++ b/user/filesedit.php
@@ -48,7 +48,7 @@ require_capability('moodle/user:manageownfiles', $context);
 $title = get_string('myfiles');
 $struser = get_string('user');
 
-$PAGE->set_url('/user/files.php');
+$PAGE->set_url('/user/filesedit.php');
 $PAGE->set_context($context);
 $PAGE->set_title($title);
 $PAGE->set_heading($title);

diff --git a/version.php b/version.php
index 67d54d6..e52327f 100644 (file)
--- a/version.php
+++ b/version.php
@@ -30,7 +30,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 
-$version  = 2012051100.03;              // YYYYMMDD      = weekly release date of this DEV branch
+$version  = 2012051700.00;              // YYYYMMDD      = weekly release date of this DEV branch
                                         //         RR    = release increments - 00 in DEV branches
                                         //           .XX = incremental changes