Fixes for cursorbot

Author: nolanpro

ProcessMaker/Console/Commands/TenantsVerify.php

@@ -37,13 +37,19 @@ class TenantsVerify extends Command
 
     public function handle()
     {
+        if (!config('app.multitenancy')) {
+            $this->info('Multitenancy is disabled');
+
+            return;
+        }
+
         $errors = [];
         $currentTenant = null;
         if (app()->has('currentTenant')) {
             $currentTenant = app('currentTenant');
         }
 
-        if (config('app.multitenancy') && !$currentTenant) {
+        if (!$currentTenant) {
             $this->error('Multitenancy enabled but no current tenant found.');
 
             return;

ProcessMaker/Multitenancy/SwitchTenant.php

@@ -101,11 +101,12 @@ private function overrideConfigs(Application $app, IsTenant $tenant)
         }
 
         // Filesystem roots
-        $newStoragePath = storage_path('tenant_' . $tenant->id);
+        $landlordStoragePath = base_path('storage');
+        $newStoragePath = base_path('storage/tenant_' . $tenant->id);
         foreach ($this->landlordConfig('filesystems.disks') as $disk => $config) {
             if (isset($config['root'])) {
                 $this->setConfig('filesystems.disks.' . $disk . '.root', str_replace(
-                    storage_path(),
+                    $landlordStoragePath,
                     $newStoragePath,
                     $config['root']
                 ));