merging from 18 STABLE

diff --git a/question/format/webct/format.php b/question/format/webct/format.php
index 104f765b73a1d45ca24fc46d50658a76bb25d134..8e6ecd6fe574e61fc802c0d842172d3c4d87880c 100644 (file)
--- a/question/format/webct/format.php
+++ b/question/format/webct/format.php
@@ -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);