Skip to content

Commit

Permalink
Merge pull request #512 from roots/log1x/patch
Browse files Browse the repository at this point in the history
* fix(mu-plugins): A more sane fix for #510
* chore(mu-plugins): Bump bedrock-autoloader version
  • Loading branch information
Log1x authored Apr 24, 2020
2 parents 998dee1 + 785d04d commit 0948e18
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
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
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

1 comment on commit 0948e18

@abdusfauzi
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How do I can make sure my other setups will be update to the latest version of Bedrock Autoloader?

Please sign in to comment.