L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-42965_master' of https://github.com/totara/openbadges

Browse Source
This commit is contained in:
Sam Hemelryk
2013-12-19 16:12:46 +13:00
parent 70f1ddba87 acfe72293f
commit a0e1168751
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
badges/criteria/award_criteria_profile.php
+4 -2
View File
@@ -179,7 +179,7 @@ class award_criteria_profile extends award_criteria {
$infodata[] = " uid.fieldid = :fieldid{$param['field']} ";
$sqlparams["fieldid{$param['field']}"] = $param['field'];
} else {
$userdata[] = " u.{$param['field']} != '' ";
$userdata[] = $DB->sql_isnotempty('u', "u.{$param['field']}", false, true);
}
}
@@ -209,6 +209,8 @@ class award_criteria_profile extends award_criteria {
* @return array list($join, $where, $params)
*/
public function get_completed_criteria_sql() {
global $DB;
$join = '';
$where = '';
$params = array();
@@ -219,7 +221,7 @@ class award_criteria_profile extends award_criteria {
$infodata[] = " uid.fieldid = :fieldid{$param['field']} ";
$params["fieldid{$param['field']}"] = $param['field'];
} else {
$userdata[] = " u.{$param['field']} != '' ";
$userdata[] = $DB->sql_isnotempty('u', "u.{$param['field']}", false, true);
}
}