MDL-11511, make logic more clear, merged from MOODLE_19_STABLE

diff --git a/mod/data/lib.php b/mod/data/lib.php
index 4692ecb08dae0d518d56565339f755dd6b327b01..7e457aabc153073e978f0dcc2271db3832fcc446 100755 (executable)
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -955,16 +955,18 @@ function data_print_template($template, $records, $data, $search='',$page=0, $re
         $patterns[]='##edit##';
         $patterns[]='##delete##';
         $isteacher = has_capability('mod/data:manageentries', $context);
-        $isowner = data_isowner($record->id);
+        $isowner   = data_isowner($record->id);
+        $canedit   = $isteacher or ($isowner && has_capability('mod/data:editownentries', $context));
+        $candelete = $isteacher or ($isowner && has_capability('mod/data:deleteownentries', $context));
 
-        if ($isteacher or ($isowner && has_capability('mod/data:editownentries', $context)) ) {
+        if ($canedit) {
             $replacement[] = '<a href="'.$CFG->wwwroot.'/mod/data/edit.php?d='
                              .$data->id.'&amp;rid='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$CFG->pixpath.'/t/edit.gif" class="iconsmall" alt="'.get_string('edit').'" title="'.get_string('edit').'" /></a>';
         }else{
             $replacement[] = '';
         }
 
-        if($isteacher or ($isowner && has_capability('mod/data:deleteownentries', $context)) ) {
+        if($candelete) {
             $replacement[] = '<a href="'.$CFG->wwwroot.'/mod/data/view.php?d='
                              .$data->id.'&amp;delete='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$CFG->pixpath.'/t/delete.gif" class="iconsmall" alt="'.get_string('delete').'" title="'.get_string('delete').'" /></a>';
         }else{