|
|
|
@ -461,23 +461,24 @@ class SessionManager |
|
|
|
|
} else { |
|
|
|
|
$select = |
|
|
|
|
"SELECT DISTINCT |
|
|
|
|
s.name, |
|
|
|
|
s.display_start_date, |
|
|
|
|
s.display_end_date, |
|
|
|
|
access_start_date, |
|
|
|
|
access_end_date, |
|
|
|
|
s.visibility, |
|
|
|
|
s.session_category_id, |
|
|
|
|
$inject_extra_fields |
|
|
|
|
s.id |
|
|
|
|
s.name, |
|
|
|
|
s.display_start_date, |
|
|
|
|
s.display_end_date, |
|
|
|
|
access_start_date, |
|
|
|
|
access_end_date, |
|
|
|
|
s.visibility, |
|
|
|
|
s.session_category_id, |
|
|
|
|
$inject_extra_fields |
|
|
|
|
s.id |
|
|
|
|
"; |
|
|
|
|
|
|
|
|
|
$isMakingOrder = strpos($options['order'], 'category_name') === 0; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$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 "; |
|
|
|
|
|
|
|
|
|
if ($isFilteringSessionCategory) { |
|
|
|
@ -516,7 +517,6 @@ class SessionManager |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$formatted_sessions = array(); |
|
|
|
|
|
|
|
|
|
if (Database::num_rows($result)) { |
|
|
|
|
$sessions = Database::store_result($result, 'ASSOC'); |
|
|
|
|
if ($get_count) { |
|
|
|
|