Skip to content
Browse files

Merge from 1.9 as HEAD is different

MDL-16427 implement the '*' convention as for other questiontypes
MDL-15358 negative data and MDL-16427 handling 0
MDL-15233 tolerance
  • Loading branch information...
1 parent defb0f6 commit 48f12348965311e41c93f5d1bbf411e76d1bf81e pichetp committed
Showing with 4 additions and 4 deletions.
  1. +4 −4 question/type/datasetdependent/abstractqtype.php
View
8 question/type/datasetdependent/abstractqtype.php
@@ -86,14 +86,14 @@ function substitute_variables($str, $dataset) {
if($value < 0 ){
$str = str_replace('{'.$name.'}', '('.$value.')', $str);
} else {
- $str = str_replace('{'.$name.'}', $value, $str);
- }
-
-
+ $str = str_replace('{'.$name.'}', $value, $str);
+ }
}
return $str;
}
+
+
function finished_edit_wizard(&$form) {
return isset($form->backtoquiz);
}

0 comments on commit 48f1234

Please sign in to comment.
Something went wrong with that request. Please try again.