From 6b7f8df2ec516f3a7ea7c189f0466b338876db63 Mon Sep 17 00:00:00 2001 From: mjollnir_ Date: Tue, 23 Nov 2004 23:05:06 +0000 Subject: [PATCH] Merged from MOODLE_14_STABLE: Fixing use of UCASE and LCASE in glossary which are not postgres friendly - two new functions in datalib, db_uppercase and db_lowercase which return the database-correct functions to use. Some were already fixed in HEAD - those have been left as they were --- lib/datalib.php | 35 +++++++++++++++++++++++++++++++++ mod/glossary/editcategories.php | 3 ++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/lib/datalib.php b/lib/datalib.php index cb4ee14668..9ae6b30a72 100644 --- a/lib/datalib.php +++ b/lib/datalib.php @@ -80,6 +80,41 @@ function begin_sql() { } return true; } + +/** + * returns db specific uppercase function + */ +function db_uppercase() { + global $CFG; + switch (strtolower($CFG->dbtype)) { + + case "postgres7": + return "upper"; + break; + case "mysql": + default: + return "ucase"; + break; + } +} + +/** + * returns db specific lowercase function + */ +function db_lowercase() { + global $CFG; + switch (strtolower($CFG->dbtype)) { + + case "postgres7": + return "lower"; + break; + case "mysql": + default: + return "lcase"; + break; + } +} + /** * on DBs that support it, commit the transaction */ diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php index 4bc94c8e03..421461ca17 100644 --- a/mod/glossary/editcategories.php +++ b/mod/glossary/editcategories.php @@ -132,7 +132,8 @@ } elseif ( $action == "add" ) { if ( $confirm ) { - $dupcategory = get_record("glossary_categories","lcase(name)",strtolower($name),"glossaryid",$glossary->id); + $lcase = db_lowercase(); + $dupcategory = get_record("glossary_categories","$lcase(name)",strtolower($name),"glossaryid",$glossary->id); if ( $dupcategory ) { echo "

" . get_string("add"). " " . get_string("category","glossary") . ""; -- 2.39.5