Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2026-05-07 03:36:30 +02:00
Code Issues Packages Projects Releases Activity

Rename dependencies to dependenciesThatCanBeRemovedWhenRemoving, be more specific. Remove unused parameter

Browse Source
This commit is contained in:
Flavio Copes
2016-03-04 18:08:30 +01:00
parent 1eb25fbfba
commit fecb1b179a
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
classes/admin.php
View File

@@ -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]);
}
}

2
themes/grav/templates/plugins.html.twig
View File

@@ -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() %}