Merged from MOODLE_14_STABLE: Fixing use of UCASE and LCASE in glossary which are...

diff --git a/lib/datalib.php b/lib/datalib.php
index cb4ee1466834867d5e384f2dd3af7fabcca9d514..9ae6b30a72d0a72f2df07448830f9ec7ce26fef6 100644 (file)
--- 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 4bc94c8e035d9cd93ccf901b19aa2cb0b2b68def..421461ca1773e9c708b5754f2a99693ff16eb041 100644 (file)
--- 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 "<p align=\"center\">" . get_string("add"). " " . get_string("category","glossary") . "<font size=\"3\">";