Fix Nginx rules again

Author: cssjoe

BrowserCache_Environment_Nginx.php

@@ -300,22 +300,27 @@ private function generate_section( &$rules, $mime_types, $section ) {
 			$subrules = Dispatcher::nginx_rules_for_browsercache_section( $this->c, $section );
 			$rules   .= '    ' . implode( "\n    ", $subrules ) . "\n";
 
-			if ( ! $this->c->get_boolean( 'browsercache.no404wp' ) ) {
-				$wp_uri            = network_home_url( '', 'relative' );
-				$wp_uri            = rtrim( $wp_uri, '/' );
-				$extensions_active = $this->c->get_array( 'extensions.active' );
-
-				if ( 'other' === $section && array_key_exists( 'imageservice', $extensions_active ) ) {
-					$rules .= "\n" . '    location ~* ^(?<path>.+)\.(jpe?g|png|gif)$ {' . "\n" .
-						'        if ( $http_accept !~* "webp|\*/\*" ) {' . "\n" .
-						'            break;' . "\n" .
-						'        }' . "\n\n" .
-						'        ' . implode( "\n        ", Dispatcher::nginx_rules_for_browsercache_section( $this->c, $section, true ) ) . "\n" .
-						'        add_header Vary Accept;' . "\n" .
-						'        try_files ${path}.webp $uri /index.php?$args;' . "\n" .
-						'    }' . "\n\n";
+			// Add rules for the Image Service extension, if active.
+			if ( 'other' === $section && array_key_exists( 'imageservice', $this->c->get_array( 'extensions.active' ) ) ) {
+				$rules .= "\n" . '    location ~* ^(?<path>.+)\.(jpe?g|png|gif)$ {' . "\n" .
+					'        if ( $http_accept !~* "webp|\*/\*" ) {' . "\n" .
+					'            break;' . "\n" .
+					'        }' . "\n\n" .
+					'        ' . implode( "\n        ", Dispatcher::nginx_rules_for_browsercache_section( $this->c, $section, true ) ) . "\n" .
+					'        add_header Vary Accept;' . "\n";
+
+				if ( $this->c->get_boolean( 'browsercache.no404wp' ) ) {
+					$rules .= '        try_files ${path}.webp $uri =404;';
+				} else {
+					$rules .= '        try_files ${path}.webp $uri /index.php?$args;';
 				}
 
+				$rules .= "\n" . '    }' . "\n\n";
+			}
+
+			if ( ! $this->c->get_boolean( 'browsercache.no404wp' ) ) {
+				$wp_uri = network_home_url( '', 'relative' );
+				$wp_uri = rtrim( $wp_uri, '/' );
 				$rules .= '    try_files $uri $uri/ ' . $wp_uri . '/index.php?$args;' . "\n";
 			}
 

Extension_ImageService_Environment.php

@@ -147,11 +147,17 @@ private function rules_generate() {
 				$config = Dispatcher::config();
 
 				/*
-				 * Add Nginx rules only if Browser Cache is disabled or no404wp is enabled.
+				 * Add Nginx rules only if Browser Cache is disabled.
 				 * Otherwise, the rules are added in "BrowserCache_Environment_Nginx.php".
 				 * @see BrowserCache_Environment_Nginx::generate_section()
 				 */
-				if ( $config->get_boolean( 'browsercache.no404wp' ) || ! $config->get_boolean( 'browsercache.enabled' ) ) {
+				if ( ! $config->get_boolean( 'browsercache.enabled' ) ) {
+					if ( $config->get_boolean( 'browsercache.no404wp' ) ) {
+						$fallback = '=404';
+					} else {
+						$fallback = '/index.php?$args';
+					}
+
 					return '
 # BEGIN W3TC WEBP
 location ~* ^(?<path>.+)\.(jpe?g|png|gif)$ {
@@ -162,7 +168,7 @@ private function rules_generate() {
     ' . implode( "\n    ", Dispatcher::nginx_rules_for_browsercache_section( $config, 'other' ) ) . '
 
     add_header Vary Accept;
-    try_files ${path}.webp $uri =404;
+    try_files ${path}.webp $uri ' . $fallback . ';
 }
 # END W3TC WEBP