Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(mu-plugins): Bump bedrock-autoloader version #512

Merged
merged 3 commits into from
Apr 24, 2020
Merged

chore(mu-plugins): Bump bedrock-autoloader version #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbdc0ea
chore(mu-plugins): Bump bedrock-autoloader version
Log1x Apr 24, 2020
0f26717
fix(lint): ...
Log1x Apr 24, 2020
785d04d
chore(changelog): ...
Log1x Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
### Head

### 1.13.4: 2020-04-24

* fix(mu-plugins): Bump bedrock-autoloader version ([#512](https://github.com/roots/bedrock/pull/512))
* fix(mu-plugins): A more sane fix for #510 ([#512](https://github.com/roots/bedrock/pull/512))

### 1.13.3: 2020-04-24

* enhance(ci): Add CircleCI workflow for PHP 7.4 ([#510](https://github.com/roots/bedrock/pull/511))
Expand Down
4 changes: 2 additions & 2 deletions web/app/mu-plugins/bedrock-autoloader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Bedrock Autoloader
* Plugin URI: https://github.com/roots/bedrock/
* Description: An autoloader that enables standard plugins to be required just like must-use plugins. The autoloaded plugins are included during mu-plugin loading. An asterisk (*) next to the name of the plugin designates the plugins that have been autoloaded.
* Version: 1.0.0
* Version: 1.0.1
* Author: Roots
* Author URI: https://roots.io/
* License: MIT License
Expand Down Expand Up @@ -173,7 +173,7 @@ private function updateCache()
$this->autoPlugins = get_plugins($this->relativePath);
$this->muPlugins = get_mu_plugins();
$plugins = array_diff_key($this->autoPlugins, $this->muPlugins);
$rebuild = !isset($this->cache['plugins']);
$rebuild = !(isset($this->cache['plugins']) && is_array($this->cache['plugins']));
$this->activated = $rebuild ? $plugins : array_diff_key($plugins, $this->cache['plugins']);
$this->cache = ['plugins' => $plugins, 'count' => $this->countPlugins()];

Expand Down