Skip to content

Gossary: Fix load glossary from base course if not found in session - refs BT#22235 #5962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 11, 2024
Merged

Gossary: Fix load glossary from base course if not found in session - refs BT#22235 #5962

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 25 additions & 12 deletions main/inc/lib/glossary.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ public static function get_glossary_term_by_glossary_name($name)
$table = Database::get_course_table(TABLE_GLOSSARY);
$session_id = api_get_session_id();
$course_id = api_get_course_int_id();
$sessionCondition = api_get_session_condition($session_id);

$glossaryName = Security::remove_XSS($name);
$glossaryName = api_convert_encoding($glossaryName, 'UTF-8', 'UTF-8');
$glossaryName = trim($glossaryName);
Expand All @@ -95,16 +93,31 @@ public static function get_glossary_term_by_glossary_name($name)
}

$sql = "SELECT * FROM $table
WHERE
c_id = $course_id AND
(
name LIKE '".Database::escape_string($glossaryName)."'
OR
name LIKE '".Database::escape_string($parsed)."'
)
$sessionCondition
LIMIT 1
";
WHERE
c_id = $course_id AND
(
name LIKE '".Database::escape_string($glossaryName)."' OR
name LIKE '".Database::escape_string($parsed)."'
) AND
session_id = $session_id
LIMIT 1";

$rs = Database::query($sql);

if (Database::num_rows($rs) > 0) {
return Database::fetch_array($rs, 'ASSOC');
}

$sql = "SELECT * FROM $table
WHERE
c_id = $course_id AND
(
name LIKE '".Database::escape_string($glossaryName)."' OR
name LIKE '".Database::escape_string($parsed)."'
) AND
session_id IS NULL
LIMIT 1";

$rs = Database::query($sql);

if (Database::num_rows($rs) > 0) {
Expand Down