From d56a4dc5f5a2f309e0f10532e2ecd4f7bf730bd2 Mon Sep 17 00:00:00 2001 From: Jordi Piguillem Date: Fri, 14 May 2010 08:27:15 +0000 Subject: [PATCH] Fixing problems like in [MDL-22352]. --- mod/wiki/renderer.php | 4 +++- mod/wiki/search.php | 4 +++- mod/wiki/view.php | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/mod/wiki/renderer.php b/mod/wiki/renderer.php index dad659eece2..289e86c1272 100644 --- a/mod/wiki/renderer.php +++ b/mod/wiki/renderer.php @@ -35,7 +35,9 @@ class mod_wiki_renderer extends plugin_renderer_base { } // @TODO: Fix call to wiki_get_subwiki_by_group - $gid = groups_get_activity_group($this->page->cm); + if ($gid = groups_get_activity_group($this->page->cm)){ + $gid = 0; + } if (!$subwiki = wiki_get_subwiki_by_group($this->page->cm->instance, $gid)) { return false; } diff --git a/mod/wiki/search.php b/mod/wiki/search.php index 766e10dd555..750938f2bc1 100644 --- a/mod/wiki/search.php +++ b/mod/wiki/search.php @@ -41,7 +41,9 @@ if (! $cm = get_coursemodule_from_id('wiki', $cmid)) { require_course_login($course, true, $cm); // @TODO: Fix call to wiki_get_subwiki_by_group -$gid = groups_get_activity_group($cm); +if (!$gid = groups_get_activity_group($cm)){ + $gid = 0; +} if (!$subwiki = wiki_get_subwiki_by_group($cm->instance, $gid)){ return false; } diff --git a/mod/wiki/view.php b/mod/wiki/view.php index c5d7830a1c9..ad6f359e9e4 100644 --- a/mod/wiki/view.php +++ b/mod/wiki/view.php @@ -241,7 +241,9 @@ if ($id) { // Checking subwiki instance // @TODO: Fix call to wiki_get_subwiki_by_group - $currentgroup = groups_get_activity_group($cm); + if (!$currentgroup = groups_get_activity_group($cm)){ + $currentgroup = 0; + } if (!$subwiki = wiki_get_subwiki_by_group($wid, $currentgroup)) { print_error('incorrectsubwikiid', 'wiki'); }