Fix list enabled/disabled addons

diff --git a/src/Console/Addon.php b/src/Console/Addon.php
index 80668532468fde99c75a7f6c289eb96703a107a7..1623ab13f040ce2e966164bdd7b58b3bcf567912 100644 (file)
--- a/src/Console/Addon.php
+++ b/src/Console/Addon.php
@@ -121,27 +121,28 @@ HELP;
                                $this->out($this->getHelp());
                                return false;
                }
+
                foreach (AddonCore::getAvailableList() as $addon) {
                        $addon_name = $addon[0];
-                       $enabled = AddonCore::isEnabled($addon_name) ? "enabled" : "disabled";
-                       switch ($subCmd) {
-                               case 'all':
-                                       $table->addRow([$addon_name, $enabled]);
-                                       break;
-                               case 'enabled':
-                                       if (!$enabled) {
-                                               continue 2;
-                                       }
-                                       $table->addRow([$addon_name]);
-                               case 'disabled':
-                                       if ($enabled) {
-                                               continue 2;
-                                       }
-                                       $table->addRow([$addon_name]);
-                                       break;
+                       $enabled = AddonCore::isEnabled($addon_name);
+
+                       if ($subCmd === 'all') {
+                               $table->addRow([$addon_name, $enabled ? 'enabled' : 'disabled']);
+
+                               continue;
                        }
 
+                       if ($subCmd === 'enabled' && $enabled === true) {
+                               $table->addRow([$addon_name]);
+                               continue;
+                       }
+
+                       if ($subCmd === 'disabled' && $enabled === false) {
+                               $table->addRow([$addon_name]);
+                               continue;
+                       }
                }
+
                $this->out($table->getTable());
 
                return 0;