From: Sam Hemelryk Date: Mon, 30 Apr 2012 00:16:35 +0000 (+1200) Subject: Merge branch 'MDL-19391-master-1' of git://git.luns.net.uk/moodle X-Git-Tag: v2.3.0-beta~657 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=bc0be2fb800e963528a36fc62406f450e4109719;hp=49ddf4195c6246f41214fa30e143293b3fc4f3f9 Merge branch 'MDL-19391-master-1' of git://git.luns.net.uk/moodle --- diff --git a/mod/data/lib.php b/mod/data/lib.php index d816cc3cff5..d846ea28550 100644 --- a/mod/data/lib.php +++ b/mod/data/lib.php @@ -1314,7 +1314,7 @@ function data_print_template($template, $records, $data, $search='', $page=0, $r $patterns[]='##approve##'; if (has_capability('mod/data:approve', $context) && ($data->approval) && (!$record->approved)){ - $replacement[] = ''.get_string('approve').''; + $replacement[] = ''.get_string('approve').''; } else { $replacement[] = ''; } @@ -3604,4 +3604,4 @@ function data_get_advanced_search_sql($sort, $data, $recordids, $selectdata, $so $sqlselect['sql'] = "$nestselectsql $nestfromsql $sortorder"; $sqlselect['params'] = $inparam; return $sqlselect; -} \ No newline at end of file +}