merging from 18 STABLE
This commit is contained in:
@@ -246,7 +246,6 @@ class qformat_webct extends qformat_default {
|
||||
}
|
||||
|
||||
function readquestions ($lines) {
|
||||
|
||||
$qtypecalculated = new qformat_webct_modified_calculated_qtype();
|
||||
$webctnumberregex =
|
||||
'[+-]?([0-9]+(\\.[0-9]*)?|\\.[0-9]+)((e|E|\\*10\\*\\*)([+-]?[0-9]+|\\([+-]?[0-9]+\\)))?';
|
||||
@@ -264,7 +263,6 @@ class qformat_webct extends qformat_default {
|
||||
$lines[] = ":EOF:"; // for an easiest processing of the last line
|
||||
// $question = $this->defaultquestion();
|
||||
|
||||
|
||||
foreach ($lines as $line) {
|
||||
$nLineCounter++;
|
||||
$line = iconv("Windows-1252","UTF-8",$line);
|
||||
|
||||
Reference in New Issue
Block a user