mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-13 02:04:35 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#1365

Browse Source
This commit is contained in:
Ryan Cramer
2021-04-19 10:51:47 -04:00
parent 9f1f440b82
commit 8644ab7b57
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wire/core/Modules.php
View File

@@ -2206,7 +2206,7 @@ class Modules extends WireArray {
public function ___delete($class) { public function ___delete($class) {
$class = $this->getModuleClass($class); $class = $this->getModuleClass($class);
$success = false; $success = true;
$reason = $this->isDeleteable($class, true); $reason = $this->isDeleteable($class, true);
if($reason !== true) throw new WireException($reason); if($reason !== true) throw new WireException($reason);
$siteModulesPath = $this->wire('config')->paths->siteModules; $siteModulesPath = $this->wire('config')->paths->siteModules;
@@ -2289,11 +2289,11 @@ class Modules extends WireArray {
if(!$inRoot && !$numOtherModules && !$numLinks) { if(!$inRoot && !$numOtherModules && !$numLinks) {
// the modulePath had no other modules or directories in it, so we can delete it entirely // the modulePath had no other modules or directories in it, so we can delete it entirely
$success = wireRmdir($path, true); $success = $fileTools->rmdir($path, true);
if($success) { if($success) {
$this->message("Removed directory: $path", Notice::debug); $this->message("Removed directory: $path", Notice::debug);
if(is_dir($backupPath)) { if(is_dir($backupPath)) {
if(wireRmdir($backupPath, true)) $this->message("Removed directory: $backupPath", Notice::debug); if($fileTools->rmdir($backupPath, true)) $this->message("Removed directory: $backupPath", Notice::debug);
} }
$files = array(); $files = array();
} else { } else {
@@ -2306,15 +2306,14 @@ class Modules extends WireArray {
foreach($files as $file) { foreach($files as $file) {
$file = "$path/$file"; $file = "$path/$file";
if(!file_exists($file)) continue; if(!file_exists($file)) continue;
if($this->wire('files')->unlink($file, $siteModulesPath)) { if($fileTools->unlink($file, $siteModulesPath)) {
$this->message("Removed file: $file", Notice::debug); $this->message("Removed file: $file", Notice::debug);
} else { } else {
$this->error("Unable to remove file: $file", Notice::debug); $this->error("Unable to remove file: $file", Notice::debug);
} }
} }
if($success) $this->log("Deleted module '$class'"); $this->log("Deleted module '$class'");
else $this->error("Failed to delete module '$class'");
return $success; return $success;
} }