mirror of
https://github.com/wallabag/wallabag.git
synced 2024-10-31 22:28:54 +00:00
fix #1154
This commit is contained in:
parent
3d2b9e2e23
commit
f5618feb73
3 changed files with 13 additions and 8 deletions
|
@ -392,8 +392,11 @@ final class Tools
|
|||
);
|
||||
|
||||
foreach ($files as $fileInfo) {
|
||||
$todo = ($fileInfo->isDir() ? 'rmdir' : 'unlink');
|
||||
$todo($fileInfo->getRealPath());
|
||||
$filename = $fileInfo->getFilename();
|
||||
if (!$filename[0] == '.') {
|
||||
$todo = ($fileInfo->isDir() ? 'rmdir' : 'unlink');
|
||||
$todo($fileInfo->getRealPath());
|
||||
}
|
||||
}
|
||||
|
||||
Tools::logm('empty cache');
|
||||
|
|
|
@ -18,11 +18,11 @@ require_once('install_functions.php');
|
|||
|
||||
if (isset($_GET['clean'])) {
|
||||
if (is_dir('install')){
|
||||
delTree('install');
|
||||
delTree('install', true);
|
||||
header('Location: index.php');
|
||||
}
|
||||
if (is_dir('cache')) {
|
||||
delTree('cache', false);
|
||||
delTree('cache', false, false);
|
||||
header('Location: index.php');
|
||||
}
|
||||
}
|
||||
|
|
|
@ -78,10 +78,12 @@ function pdoDrivers() {
|
|||
* Here in case of .gitignore files
|
||||
*/
|
||||
|
||||
function delTree($dir, $withdirectory="true") {
|
||||
$files = array_diff(scandir($dir), array('.','..'));
|
||||
foreach ($files as $file) {
|
||||
(is_dir("$dir/$file")) ? delTree("$dir/$file") : unlink("$dir/$file");
|
||||
function delTree($dir, $withdirectory=true, $hiddenfiles = true) {
|
||||
if ($hiddenfiles) {
|
||||
$files = array_diff(scandir($dir), array('.','..'));
|
||||
foreach ($files as $file) {
|
||||
(is_dir("$dir/$file")) ? delTree("$dir/$file") : unlink("$dir/$file");
|
||||
}
|
||||
}
|
||||
if ($withdirectory) {
|
||||
return rmdir($dir);
|
||||
|
|
Loading…
Reference in a new issue