wordpress-charmers team mailing list archive

[Thomas Cuthbert <thomas.cuthbert@xxxxxxxxxxxxx>]

Thomas Cuthbert has proposed merging ~tcuthbert/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master into ~wordpress-charmers/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master.

Requested reviews:
  Wordpress Charmers (wordpress-charmers)

For more details, see:
https://code.launchpad.net/~tcuthbert/charm-k8s-wordpress/+git/wordpress-k8s-image-builder/+merge/385968
-- 
Your team Wordpress Charmers is requested to review the proposed merge of ~tcuthbert/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master into ~wordpress-charmers/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master.

diff --git a/files/wp-config.php b/files/wp-config.php
index 158b0db..96b2475 100644
--- a/files/wp-config.php
+++ b/files/wp-config.php
@@ -22,9 +22,11 @@ if ( getenv("WORDPRESS_DEBUG") ) {
 /** Fixes for mixed content when WordPress is behind nginx TLS reverse proxy.
  * https://ahenriksson.com/2020/01/27/how-to-set-up-wordpress-behind-a-reverse-proxy-when-using-nginx/
  * */
-define('FORCE_SSL_ADMIN', true);
-if ($_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')
- $_SERVER['HTTPS']='on';
+if ( !getenv("WORDPRESS_CI") ) {
+    define('FORCE_SSL_ADMIN', true);
+    if ($_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')
+     $_SERVER['HTTPS']='on';
+}
 
 /** Absolute path to the WordPress directory. */
 if ( !defined('ABSPATH') )