From 190889b77b7f1261a0462197e19240319586164c Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Thu, 29 Mar 2018 22:45:12 +0200 Subject: [PATCH] Fix sorting of Pico::$nativePlugins Thanks to PT on our Freenode IRC channel #picocms for reporting this! --- lib/Pico.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/Pico.php b/lib/Pico.php index 7c471f1..9e170ba 100644 --- a/lib/Pico.php +++ b/lib/Pico.php @@ -770,12 +770,14 @@ class Pico $plugins = $this->plugins; $nativePlugins = $this->nativePlugins; $sortedPlugins = array(); + $sortedNativePlugins = array(); $visitedPlugins = array(); $visitPlugin = function ($plugin) use ( $plugins, $nativePlugins, &$sortedPlugins, + &$sortedNativePlugins, &$visitedPlugins, &$visitPlugin ) { @@ -802,6 +804,9 @@ class Pico } $sortedPlugins[$pluginName] = $plugin; + if (isset($nativePlugins[$pluginName])) { + $sortedNativePlugins[$pluginName] = $plugin; + } } }; @@ -814,6 +819,7 @@ class Pico } $this->plugins = $sortedPlugins; + $this->nativePlugins = $sortedNativePlugins; } /**