blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2026-07-10 18:01:05 +08:00
Code Issues Projects Releases Wiki Activity

fix: 修改数据库脚本路径计算

Browse Source
This commit is contained in:
邹景立 2024-10-16 20:46:31 +08:00
parent 19ada8aa20
commit dc46a52080
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/think-library/src/extend/ToolsExtend.php
View File

@ -72,7 +72,7 @@ class ToolsExtend
public static function removeEmptyDirectory(string $path): bool public static function removeEmptyDirectory(string $path): bool
{ {
foreach (self::findFilesYield($path, null, null, true) as $item) { foreach (self::findFilesYield($path, null, null, true) as $item) {
($item->isFile() || $item->isLink()) ? unlink($item->getRealPath()) : rmdir($item->getRealPath()); ($item->isFile() || $item->isLink()) ? unlink($item->getPathname()) : rmdir($item->getPathname());
} }
return is_file($path) ? unlink($path) : (!is_dir($path) || rmdir($path)); return is_file($path) ? unlink($path) : (!is_dir($path) || rmdir($path));
} }
@ -107,8 +107,8 @@ class ToolsExtend
if ($info->isFile() && ($filter === null || $filter($info) !== false)) { if ($info->isFile() && ($filter === null || $filter($info) !== false)) {
$files[] = $short ? $info->getBasename() : $info->getPathname(); $files[] = $short ? $info->getBasename() : $info->getPathname();
} }
if ($info->isDir()) foreach (static::findFilesYield($info->getRealPath(), $depth, $filter) as $file) { if ($info->isDir()) foreach (static::findFilesYield($info->getPathname(), $depth, $filter) as $file) {
$files[] = $short ? substr($file->getRealPath(), strlen($info->getRealPath()) + 1) : $file->getRealPath(); $files[] = $short ? substr($file->getPathname(), strlen($info->getPathname()) + 1) : $file->getPathname();
} }
} }
return $files; return $files;