mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

php 8 compat fixes for ML directory section

Browse Source
This commit is contained in:
onli 2021-05-13 14:57:19 +02:00
parent 561a86b385
commit d28b15381c
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/admin/images.inc.php
View File

@ -615,7 +615,7 @@ switch ($serendipity['GET']['adminAction']) {
$data['case_directoryCreate'] = true;
$data['formtoken'] = serendipity_setFormToken();
$data['folders'] = $folders;
$data['dir'] = $serendipity['GET']['dir'];
$data['dir'] = $serendipity['GET']['dir'] ?? null;
break;
case 'directorySelect':

2
include/functions_images.inc.php
View File

@ -73,6 +73,8 @@ function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total=null, $
if ($limit != 0) {
$limitsql = serendipity_db_limit_sql(serendipity_db_limit($start, $limit));
} else {
$limitsql = '';
}
if ($hideSubdirFiles == false) {

6
templates/2k11/admin/images.inc.tpl
View File

@ -47,9 +47,9 @@
{if isset($showML)}{$showML}{/if}
{/if}
{if $case_directoryDoDelete}
{if $print_DIRECTORY_WRITE_ERROR}<span class="msg_error"><span class="icon-attention-circled" aria-hidden="true"></span> {$print_DIRECTORY_WRITE_ERROR}</span>{/if}
{if isset($print_DIRECTORY_WRITE_ERROR) && $print_DIRECTORY_WRITE_ERROR}<span class="msg_error"><span class="icon-attention-circled" aria-hidden="true"></span> {$print_DIRECTORY_WRITE_ERROR}</span>{/if}
{if isset($ob_serendipity_killPath)}{$ob_serendipity_killPath}{/if}
{if $print_ERROR_NO_DIRECTORY}<span class="msg_error"><span class="icon-attention-circled" aria-hidden="true"></span> {$print_ERROR_NO_DIRECTORY}</span>{/if}
{if isset($print_ERROR_NO_DIRECTORY) && $print_ERROR_NO_DIRECTORY}<span class="msg_error"><span class="icon-attention-circled" aria-hidden="true"></span> {$print_ERROR_NO_DIRECTORY}</span>{/if}
{/if}
{if $case_directoryEdit}
{if !empty($smarty.post.serendipity.save)}
@ -124,7 +124,7 @@
{if $print_DIRECTORY_CREATED}
<span class="msg_success"><span class="icon-ok-circled" aria-hidden="true"></span> {$print_DIRECTORY_CREATED}</span>
{/if}
{if $print_DIRECTORY_WRITE_ERROR}
{if isset($print_DIRECTORY_WRITE_ERROR) && $print_DIRECTORY_WRITE_ERROR}
<span class="msg_error"><span class="icon-attention-circled" aria-hidden="true"></span> {$print_DIRECTORY_WRITE_ERROR}</span>
{/if}
<a class="button_link state_submit" href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=directorySelect">{$CONST.BACK}</a>