From 415f8c3eeb9126198cccf49dc4ccbbb19b8f1e64 Mon Sep 17 00:00:00 2001 From: nicolasconnault Date: Thu, 12 Jun 2008 12:55:13 +0000 Subject: [PATCH] CONTRIB-490 Fixed minor bugs uncovered by generator script --- lib/questionlib.php | 5 +++++ mod/forum/lib.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/questionlib.php b/lib/questionlib.php index 8914e68067..cac4fc6cba 100644 --- 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 433f3d2445..fd83d5cbe1 100644 --- 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; } -- 2.39.5