Fix no forums bug.

1.10.x
Julio Montoya 10 years ago
parent 398b75ce78
commit 04e116bec5
  1. 11
      main/forum/forumfunction.inc.php
  2. 6
      main/forum/index.php
  3. 6
      main/inc/lib/api.lib.php

@ -1452,7 +1452,12 @@ function get_forums(
$session_id = $sessionId;
}
$condition_session = api_get_session_condition($session_id, true, false, 'item_properties.session_id');
$condition_session = api_get_session_condition(
$session_id,
true,
false,
'item_properties.session_id'
);
$course_id = $course_info['real_id'];
$forum_list = array();
@ -1467,12 +1472,12 @@ function get_forums(
$sql = "SELECT * FROM $table_forums forum
INNER JOIN ".$table_item_property." item_properties
ON (
forum.forum_id=item_properties.ref AND
forum.forum_id = item_properties.ref AND
forum.c_id = item_properties.c_id
)
WHERE
item_properties.visibility=1 AND
item_properties.tool='".TOOL_FORUM."'
item_properties.tool = '".TOOL_FORUM."'
$condition_session AND
forum.c_id = $course_id AND
item_properties.c_id = $course_id

@ -246,6 +246,7 @@ if (is_array($forumCategories)) {
foreach ($forumCategories as $forumCategory) {
// The forums in this category.
$forumsInCategory = get_forums_in_category($forumCategory['cat_id']);
// Validation when belongs to a session.
$session_img = api_get_session_image(
$forumCategory['session_id'],
@ -277,12 +278,12 @@ if (is_array($forumCategories)) {
$descriptionCategory = $forumCategory['cat_comment'];
if (!empty($idCategory)){
if (!empty($idCategory)) {
if (
api_is_allowed_to_edit(false, true) &&
!($forumCategory['session_id'] == 0 &&
intval($sessionId) != 0)
){
) {
$iconsEdit .= '<a href="' . api_get_self() . '?' . api_get_cidreq()
. '&action=edit&content=forumcategory&id=' . intval($idCategory)
. '">' . Display::return_icon(
@ -366,7 +367,6 @@ if (is_array($forumCategories)) {
// Step 5: We display all the forums in this category.
foreach ($forum_list as $forum) {
// Here we clean the whatnew_post_info array a little bit because to display the icon we
// test if $whatsnew_post_info[$forum['forum_id']] is empty or not.

@ -2377,7 +2377,11 @@ function api_get_session_condition(
if ($with_base_content) {
$condition_session = $condition_add." ( $session_field = $session_id OR $session_field = 0 OR $session_field IS NULL) ";
} else {
$condition_session = $condition_add." $session_field = $session_id ";
if (empty($session_id)) {
$condition_session = $condition_add." ($session_field = $session_id OR $session_field IS NULL)";
} else {
$condition_session = $condition_add." $session_field = $session_id ";
}
}
return $condition_session;
}

Loading…
Cancel
Save