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

Better fix for obsolete msg wrapper for deleting media db dirs

Browse Source 
Courtesy of @ophian

References #287
This commit is contained in:
Matthias Mees
2015-02-03 14:08:57 +01:00
parent 044f1f7dd5
commit 3b36be9beb
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions_images.inc.php
View File

@ -1769,7 +1769,9 @@ function serendipity_killPath($basedir, $directory = '', $forceDelete = false) {
} }
@closedir($handle); @closedir($handle);
echo '<span class="msg_notice"><span class="icon-info-circled"></span> ';
printf(CHECKING_DIRECTORY . "<br />\n", $directory); printf(CHECKING_DIRECTORY . "<br />\n", $directory);
echo "</span>\n";
// No, we just don't kill files the easy way. We sort them out properly from the database // No, we just don't kill files the easy way. We sort them out properly from the database
// and preserve files not entered therein. // and preserve files not entered therein.

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

@ -67,7 +67,7 @@
{/if} {/if}
{if $case_directoryDoDelete} {if $case_directoryDoDelete}
{if $print_DIRECTORY_WRITE_ERROR}<span class="msg_error"><span class="icon-attention-circled"></span> {$print_DIRECTORY_WRITE_ERROR}</span>{/if} {if $print_DIRECTORY_WRITE_ERROR}<span class="msg_error"><span class="icon-attention-circled"></span> {$print_DIRECTORY_WRITE_ERROR}</span>{/if}
{if $ob_serendipity_killPath}<span class="msg_notice"><span class="icon-info-circled"></span> {$ob_serendipity_killPath}</span>{/if} {if $ob_serendipity_killPath}{$ob_serendipity_killPath}{/if}
{if $print_ERROR_NO_DIRECTORY}<span class="msg_error"><span class="icon-attention-circled"></span> {$print_ERROR_NO_DIRECTORY}</span>{/if} {if $print_ERROR_NO_DIRECTORY}<span class="msg_error"><span class="icon-attention-circled"></span> {$print_ERROR_NO_DIRECTORY}</span>{/if}
{/if} {/if}
{if $case_directoryEdit} {if $case_directoryEdit}