Merge branch '4.3-dev' into upd-fail-fix

joomla · Sep 13, 2023 · 509d5fb · 509d5fb
2 parents ba11ab4 + e0fce25
commit 509d5fb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/installation/src/Console/InstallCommand.php b/installation/src/Console/InstallCommand.php
@@ -152,7 +152,7 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
         foreach ($files as $step => $schema) {
             $serverType = $db->getServerType();
 
-            if (\in_array($step, ['custom1', 'custom2']) && !is_file('sql/' . $serverType . '/' . $schema . '.sql')) {
+            if (\in_array($step, ['custom1', 'custom2']) && !is_file(JPATH_INSTALLATION . '/sql/' . $serverType . '/' . $schema . '.sql')) {
                 continue;
             }
 

diff --git a/installation/src/Controller/InstallationController.php b/installation/src/Controller/InstallationController.php
@@ -144,7 +144,7 @@ public function populate()
         $schema     = $files[$step];
         $serverType = $db->getServerType();
 
-        if (in_array($step, ['custom1', 'custom2']) && !is_file('sql/' . $serverType . '/' . $schema . '.sql')) {
+        if (in_array($step, ['custom1', 'custom2']) && !is_file(JPATH_INSTALLATION . '/sql/' . $serverType . '/' . $schema . '.sql')) {
             $this->sendJsonResponse($r);
 
             return;