Skip to content

Commit 5a19a9c

Browse files
timmywilKrinkle
authored andcommitted
plugins: restore puppet management of staging plugins
- localhost can still bypass this behavior by setting JQUERY_STAGING to 'local'
1 parent 7c1d367 commit 5a19a9c

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

plugins/jquery-filters.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,18 @@
1414
$sites = jquery_sites();
1515
$options = array_merge( $options, $sites[ JQUERY_LIVE_SITE ]['options'] );
1616
foreach ( $options as $option => $value ) {
17-
// Skip these in production, where they are managed by puppet.
18-
// Staging should be allowed to set them for testing.
17+
// Skip these on live sites (both production and staging),
18+
// where they are managed by puppet.
1919
// Local testing with a fresh database does not
2020
// currently work if these are skipped.
21-
if ( !JQUERY_STAGING ) {
21+
if ( JQUERY_STAGING !== 'local' ) {
2222
if ( $option === 'stylesheet' || $option === 'template' ) {
2323
// Don't mess with themes for now.
2424
continue;
2525
}
2626
if ( $option === 'active_plugins' ) {
27-
// In production, Puppet manages activation of per-site plugins.
27+
// On live sites (including staging ones),
28+
// Puppet manages activation of per-site plugins.
2829
continue;
2930
}
3031
}

0 commit comments

Comments
 (0)