Fixed error on the Plugins page if there was a plugin in DB but not C…

…omposer
craftcms · Feb 7, 2019 · dd3c72c · dd3c72c
1 parent 962fa51
commit dd3c72c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -10,6 +10,7 @@
 - Fixed a SQL error that could occur when deleting an asset. ([#3786](https://github.com/craftcms/cms/issues/3786))
 - Fixed an error that occurred when customizing element indexes if the `allowAdminChanges` config setting was disabled. ([#3788](https://github.com/craftcms/cms/issues/3788))
 - Fixed a bug where Checkboxes, Dropdown, Multi-select, and Radio Buttons fields wouldn’t pass validation if the selected option value was `true` or `false`.
+- Fixed an error that occurred on the Settings → Plugins page, if there were any plugins in the database that weren’t Composer-installed.
 
 ## 3.1.8 - 2019-02-05
 

diff --git a/src/services/Plugins.php b/src/services/Plugins.php
@@ -1294,7 +1294,11 @@ private function _loadDisabledPluginInfo()
             $this->_disabledPluginInfo = [];
 
             foreach ($pluginInfo as $handle => &$row) {
-                $configData = $this->_getPluginConfigData($handle);
+                try {
+                    $configData = $this->_getPluginConfigData($handle);
+                } catch (InvalidPluginException $e) {
+                    continue;
+                }
 
                 // Skip enabled plugins
                 if (!empty($configData['enabled'])) {