Merge branch 'MDL-37172_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 04:28:54 +0000 (17:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 04:28:54 +0000 (17:28 +1300)
Conflicts:
question/format/learnwise/format.php

1  2 
lang/en/question.php
question/format/learnwise/format.php

Simple merge
@@@ -66,9 -62,11 +66,11 @@@ class qformat_learnwise extends qformat
          return $questions;
      }
  
 -    function readquestion($lines) {
 +    protected function readquestion($lines) {
+         global $OUTPUT;
          $text = implode(' ', $lines);
 -        $text = str_replace(array('\t','\n','\r','\''), array('','','','\\\''), $text);
 +        $text = str_replace(array('\t','\n','\r'), array('','',''), $text);
  
          $startpos = strpos($text, '<question type');
          $endpos = strpos($text, '</question>');