Merged from MOODLE_14_STABLE: Fixes in datalib and backuplib for postgres invalid sql

diff --git a/backup/backuplib.php b/backup/backuplib.php
index 7a15b65f54011b0060a9c7c21c426f344334d5fb..339a6fce8ace303efeeccf04530882c515a6e2c7 100644 (file)
--- a/backup/backuplib.php
+++ b/backup/backuplib.php
@@ -9,7 +9,7 @@
         $status = true;
         $status = execute_sql("INSERT INTO {$CFG->prefix}backup_ids
                                    (backup_code, table_name, old_id)
-                               SELECT DISTINCT '$backup_unique_code','quiz_categories',t.category
+                               SELECT DISTINCT $backup_unique_code,'quiz_categories',t.category
                                FROM {$CFG->prefix}quiz_questions t,
                                     {$CFG->prefix}quiz_question_grades g,
                                     {$CFG->prefix}quiz q

diff --git a/lib/datalib.php b/lib/datalib.php
index bfadd99e7fde06c00f64e899d6da7c882b4cf624..dc575169366fe0e9b54ce6e4a777c0d21d02f13b 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -2029,7 +2029,7 @@ function get_courses_page($categoryid="all", $sort="c.sortorder ASC", $fields="c
     global $USER, $CFG;
 
     $categoryselect = "";
-    if ($categoryid != "all") {
+    if ($categoryid != "all" && is_numeric($categoryid)) {
         $categoryselect = "c.category = '$categoryid'";
     }