Skip to content

Commit 7c8c4cc

Browse files
committed
fix problems within download module
1 parent d5c19f7 commit 7c8c4cc

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

adm_program/modules/downloads/download_function.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,9 @@
166166
// Datei / Ordner umbenennen
167167
elseif ($getMode === 4)
168168
{
169-
if ((!$getFileId && !$getFolderId) || ($getFileId && $getFolderId))
169+
if (!$getFileId && !$getFolderId)
170170
{
171-
// Es muss entweder eine FileID ODER eine FolderId uebergeben werden
172-
// beides ist auch nicht erlaubt
171+
// fileid and/or folderid must be set
173172
$gMessage->show($gL10n->get('SYS_INVALID_PAGE_VIEW'));
174173
}
175174

adm_program/modules/downloads/downloads.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
$nextFolder = $folderContent['folders'][$i];
131131

132132
$folderDescription = '';
133-
if(strlen($nextFolder['fol_description']) > 0)
133+
if($nextFolder['fol_description'] !== null)
134134
{
135135
$folderDescription = '<img class="admidio-icon-help" src="'. THEME_PATH. '/icons/info.png" data-toggle="popover" data-trigger="hover"
136136
data-placement="right" title="'.$gL10n->get('SYS_DESCRIPTION').'" data-content="'.$nextFolder['fol_description'].'" alt="Info" />';
@@ -196,7 +196,7 @@
196196
$timestamp = DateTime::createFromFormat('Y-m-d H:i:s', $nextFile['fil_timestamp']);
197197

198198
$fileDescription = '';
199-
if($nextFile['fil_description'] !== '')
199+
if($nextFile['fil_description'] !== null)
200200
{
201201
$fileDescription = '<img class="admidio-icon-help" src="'. THEME_PATH. '/icons/info.png" data-toggle="popover" data-trigger="hover"
202202
data-placement="right" title="'.$gL10n->get('SYS_DESCRIPTION').'" data-content="'.$nextFile['fil_description'].'" alt="Info" />';

0 commit comments

Comments
 (0)