Generalize and more safely load postFlight() include

joomlashack · Sep 7, 2021 · ba6d365 · ba6d365
1 parent 04fa347
commit ba6d365
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/src/admin/library/Free/Installer/AbstractScript.php b/src/admin/library/Free/Installer/AbstractScript.php
@@ -69,16 +69,19 @@ public function postFlight($type, $parent)
             parent::postFlight($type, $parent);
 
             if ($type != 'uninstall') {
-                $this->checkParamStructure();
-                $this->checkAndCreateDefaultCategory();
-                $this->fixOrderingParamForMenus();
-                $this->fixDownloadsViewParams();
-                $this->fixItemViewParams();
-                $this->fixDatabase();
-                $this->clearProData();
-
-                if ($type == 'update') {
-                    $this->moveLayouts();
+                $include = JPATH_ADMINISTRATOR . '/components/com_osdownloads/include.php';
+                if (is_file($include) && include $include) {
+                    $this->checkParamStructure();
+                    $this->checkAndCreateDefaultCategory();
+                    $this->fixOrderingParamForMenus();
+                    $this->fixDownloadsViewParams();
+                    $this->fixItemViewParams();
+                    $this->fixDatabase();
+                    $this->clearProData();
+
+                    if ($type == 'update') {
+                        $this->moveLayouts();
+                    }
                 }
             }
 
@@ -170,8 +173,6 @@ protected function checkAndCreateDefaultCategory()
      */
     protected function fixOrderingParamForMenus()
     {
-        require_once JPATH_ADMINISTRATOR . '/components/com_osdownloads/include.php';
-
         $db = $this->dbo;
 
         $query = $db->getQuery(true)