From fecb1b179a34d02719bc238a1ba4a204d249e001 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Fri, 4 Mar 2016 18:08:30 +0100 Subject: [PATCH] Rename dependencies to dependenciesThatCanBeRemovedWhenRemoving, be more specific. Remove unused parameter --- classes/admin.php | 15 ++++++++------- themes/grav/templates/plugins.html.twig | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/classes/admin.php b/classes/admin.php index 18a18a2e..19479c18 100644 --- a/classes/admin.php +++ b/classes/admin.php @@ -485,7 +485,7 @@ class Admin * * @return array|bool */ - public function dependencies($slug, $remove_duplicates = false, $keys_already_added = []) + public function dependenciesThatCanBeRemovedWhenRemoving($slug, $keys_already_added = []) { $gpm = $this->gpm(); @@ -507,13 +507,14 @@ class Admin } foreach ($package->dependencies as $dependency) { - $temp_dependencies = $this->dependencies($dependency, $keys_already_added); + if ($dependency) - if ($remove_duplicates) { - foreach($keys_already_added as $key => $value) { - if (is_string($value)) { - unset($temp_dependencies[$value]); - } + + $temp_dependencies = $this->dependenciesThatCanBeRemovedWhenRemoving($dependency, $keys_already_added); + + foreach($keys_already_added as $key => $value) { + if (is_string($value)) { + unset($temp_dependencies[$value]); } } diff --git a/themes/grav/templates/plugins.html.twig b/themes/grav/templates/plugins.html.twig index c8bcd0d7..8dda079f 100644 --- a/themes/grav/templates/plugins.html.twig +++ b/themes/grav/templates/plugins.html.twig @@ -14,7 +14,7 @@ {% else %} {# Local #} {% set installed = true %} - {% set dependencies = admin.dependencies(plugin_slug) %} + {% set dependenciesThatCanBeRemoved = admin.dependenciesThatCanBeRemovedWhenRemoving(plugin_slug) %} {% endif %} {% set plugin = package.toArray() %}