CONTRIB-490 Fixed minor bugs uncovered by generator script

diff --git a/lib/questionlib.php b/lib/questionlib.php
index 8914e6806750759ea65a191878d23df5c0c057f2..cac4fc6cba5dd25aaed378bdc897081ed51e996f 100644 (file)
--- a/lib/questionlib.php
+++ b/lib/questionlib.php
@@ -2213,6 +2213,11 @@ class context_to_string_translator{
 function question_has_capability_on($question, $cap, $cachecat = -1){
     global $USER, $DB;
 
+    // nicolasconnault@gmail.com In some cases I get $question === false. Since no such object exists, it can't be deleted, we can safely return true
+    if ($question === false) {
+        return true;
+    }
+
     // these are capabilities on existing questions capabilties are
     //set per category. Each of these has a mine and all version. Append 'mine' and 'all'
     $question_questioncaps = array('edit', 'view', 'use', 'move');

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 433f3d244546bc202cb205ea6c180749a8763c36..fd83d5cbe19e64153b3be578db7baa7169874bad 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -184,7 +184,7 @@ function forum_delete_instance($id) {
 
     forum_tp_delete_read_records(-1, -1, -1, $forum->id);
 
-    if (!$DF->delete_records('forum', array('id'=>$forum->id))) {
+    if (!$DB->delete_records('forum', array('id'=>$forum->id))) {
         $result = false;
     }