MDL-8733 fixed approving logic when editing; merged from MOODLE_16_STABLE

diff --git a/mod/data/edit.php b/mod/data/edit.php
index 6253d4a526765698de8d62264794e9bddee169e4..0fb13dba80ac2c51b9cd3db8085d405d1d5191ea 100755 (executable)
--- a/mod/data/edit.php
+++ b/mod/data/edit.php
@@ -151,12 +151,11 @@
             /// All student edits are marked unapproved by default
             $record = get_record('data_records','id',$rid);
 
-            if ($data->approval == 1 || has_capability('mod/data:approve', $context)) {
-                $record->approved = 1;
-            } else {
+            /// reset approved flag after student edit
+            if (!has_capability('mod/data:approve', $context)) {
                 $record->approved = 0;
             }
-
+            
             $record->groupid = $currentgroup;
             $record->timemodified = time();
             update_record('data_records',$record);