Merge pull request #4 from glomex/maintenance/24092021_merge_upstream

disable inputs for aws access id and secret when in our infrastructur…
glomex · Sep 24, 2021 · 85b2fad · 85b2fad
2 parents 2db68ed + 047b600
commit 85b2fad
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "glomex/w3-total-cache",
     "description": "Altered version of W3TC plugin with support for internal Glomex infrastructure",
     "type": "wordpress-plugin",
-    "version": "2.1.8.1",
+    "version": "2.1.8.2",
     "require-dev": {
 		"roave/security-advisories": "dev-master"
 	},

diff --git a/inc/options/cdn/cf.php b/inc/options/cdn/cf.php
@@ -14,14 +14,14 @@
 	<th style="width: 300px;"><label for="cdn_cf_key"><?php _e( 'Access key ID:', 'w3-total-cache' ); ?></label></th>
 	<td>
 		<input id="cdn_cf_key" class="w3tc-ignore-change" type="text"
-					   <?php Util_Ui::sealing_disabled( 'cdn.' ) ?> name="cdn__cf__key" value="<?php echo esc_attr( $this->_config->get_string( 'cdn.cf.key' ) ); ?>" size="30" />
+					   <?php Util_Ui::sealing_disabled( 'cdn.' ) ?> name="cdn__cf__key" value="<?php echo esc_attr( $this->_config->get_string( 'cdn.cf.key' ) ); ?>" size="30" <?= getenv('ECS_CREDENTIALS') ? 'disabled' : '' ?> />
 	</td>
 </tr>
 <tr>
 	<th><label for="cdn_cf_secret"><?php _e( 'Secret key:', 'w3-total-cache' ); ?></label></th>
 	<td>
 		<input id="cdn_cf_secret" class="w3tc-ignore-change" type="password"
-					   <?php Util_Ui::sealing_disabled( 'cdn.' ) ?> name="cdn__cf__secret" value="<?php echo esc_attr( $this->_config->get_string( 'cdn.cf.secret' ) ); ?>" size="60" />
+					   <?php Util_Ui::sealing_disabled( 'cdn.' ) ?> name="cdn__cf__secret" value="<?php echo esc_attr( $this->_config->get_string( 'cdn.cf.secret' ) ); ?>" size="60" <?= getenv('ECS_CREDENTIALS') ? 'disabled' : '' ?> />
 	</td>
 </tr>
 <tr>

diff --git a/w3-total-cache-api.php b/w3-total-cache-api.php
@@ -5,7 +5,7 @@
 }
 
 define( 'W3TC', true );
-define( 'W3TC_VERSION', '2.1.8.1' );
+define( 'W3TC_VERSION', '2.1.8.2' );
 define( 'W3TC_POWERED_BY', 'W3 Total Cache' );
 define( 'W3TC_EMAIL', 'w3tc@w3-edge.com' );
 define( 'W3TC_TEXT_DOMAIN', 'w3-total-cache' );

diff --git a/w3-total-cache.php b/w3-total-cache.php
@@ -3,7 +3,7 @@
  * Plugin Name:       W3 Total Cache
  * Plugin URI:        https://www.boldgrid.com/totalcache/
  * Description:       The highest rated and most complete WordPress performance plugin. Dramatically improve the speed and user experience of your site. Add browser, page, object and database caching as well as minify and content delivery network (CDN) to WordPress.
- * Version:           2.1.8.1
+ * Version:           2.1.8.2
  * Requires at least: 3.8
  * Requires PHP:      5.6
  * Author:            BoldGrid