Skip to content
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

Hotfix 2024 06 24 #1527

Merged
merged 2 commits into from
Jul 19, 2024
Merged

Hotfix 2024 06 24 #1527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77cc950
Hotfix 2024-06-24
egbot Jun 24, 2024
7a29a52
Glossary bug fix
egbot Jul 19, 2024
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
8 changes: 6 additions & 2 deletions classes/GlossaryManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,15 @@ public function getTermSearch($keyword, $language, $tid, $deepSearch = 1){
$sqlWhere .= ') ';
}
if($language) $sqlWhere .= 'AND (g.language = "'.$this->cleanInStr($language).'") ';
if($tid) $sqlWhere .= 'AND (t.tid = '.$tid.' OR t2.tid = '.$tid.') ';
if($tid) $sqlWhere .= 'AND (taxalink.tid = '.$tid.' OR taxalink2.tid = '.$tid.') ';
$sql = 'SELECT DISTINCT g.glossid, g.term, g.definition, tl.relationshipType, g2.glossid as glossid2, g2.term AS term2, g2.definition AS def2
FROM glossary g LEFT JOIN glossarytermlink tl ON g.glossid = tl.glossgrpid
LEFT JOIN glossary g2 ON tl.glossid = g2.glossid ';
if($tid) $sql .= 'INNER JOIN glossarytermlink tl ON g.glossid = tl.glossid INNER JOIN glossarytaxalink t ON tl.glossgrpid = t.glossid INNER JOIN glossarytaxalink t2 ON g.glossid = t2.glossid ';
if($tid){
$sql .= 'LEFT JOIN glossarytermlink termlink ON g.glossid = termlink.glossid
LEFT JOIN glossarytaxalink taxalink ON termlink.glossgrpid = taxalink.glossid
LEFT JOIN glossarytaxalink taxalink2 ON g.glossid = taxalink2.glossid ';
}
if($sqlWhere) $sql .= 'WHERE '.substr($sqlWhere, 3);
if($rs = $this->conn->query($sql)){
while($r = $rs->fetch_object()){
Expand Down
1 change: 1 addition & 0 deletions classes/ImageShared.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1081,6 +1081,7 @@ private static function getImgDim1($imgUrl) {
$block_size = hexdec($block_size[1]);
while(!feof($handle)) {
$i += $block_size;
if(!$block_size) return false;
$new_block .= fread($handle, $block_size);
if(isset($new_block[$i]) && $new_block[$i]=="\xFF") {
// New block detected, check for SOF marker
Expand Down
2 changes: 1 addition & 1 deletion config/symbbase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
header('X-Frame-Options: DENY');
header('Cache-control: private'); // IE 6 FIX
date_default_timezone_set('America/Phoenix');
$CODE_VERSION = '3.0.31';
$CODE_VERSION = '3.0.32';

if(!isset($CLIENT_ROOT) && isset($clientRoot)) $CLIENT_ROOT = $clientRoot;
if(substr($CLIENT_ROOT,-1) == '/') $CLIENT_ROOT = substr($CLIENT_ROOT,0,strlen($CLIENT_ROOT)-1);
Expand Down