Fix query see #1601

pull/2487/head
jmontoyaa 9 years ago
parent 90406b5d22
commit 2efecd0479
  1. 22
      main/inc/lib/sessionmanager.lib.php

@ -461,23 +461,24 @@ class SessionManager
} else { } else {
$select = $select =
"SELECT DISTINCT "SELECT DISTINCT
s.name, s.name,
s.display_start_date, s.display_start_date,
s.display_end_date, s.display_end_date,
access_start_date, access_start_date,
access_end_date, access_end_date,
s.visibility, s.visibility,
s.session_category_id, s.session_category_id,
$inject_extra_fields $inject_extra_fields
s.id s.id
"; ";
$isMakingOrder = strpos($options['order'], 'category_name') === 0; $isMakingOrder = strpos($options['order'], 'category_name') === 0;
} }
$isFilteringSessionCategory = strpos($where, 'category_name') !== false; $isFilteringSessionCategory = strpos($where, 'category_name') !== false;
$isFilteringSessionCategoryWithName = strpos($where, 'sc.name') !== false;
if ($isMakingOrder || $isFilteringSessionCategory) { if ($isMakingOrder || $isFilteringSessionCategory || $isFilteringSessionCategoryWithName) {
$inject_joins .= " LEFT JOIN $sessionCategoryTable sc ON s.session_category_id = sc.id "; $inject_joins .= " LEFT JOIN $sessionCategoryTable sc ON s.session_category_id = sc.id ";
if ($isFilteringSessionCategory) { if ($isFilteringSessionCategory) {
@ -516,7 +517,6 @@ class SessionManager
} }
$formatted_sessions = array(); $formatted_sessions = array();
if (Database::num_rows($result)) { if (Database::num_rows($result)) {
$sessions = Database::store_result($result, 'ASSOC'); $sessions = Database::store_result($result, 'ASSOC');
if ($get_count) { if ($get_count) {

Loading…
Cancel
Save