Better handling of languages prefix in the search location

Pierre Villette · Pierre Villette · commit 88c4b4e74170 · 2015-04-23T10:37:49.000-04:00
diff --git a/templates/apps/drupal/drupal.j2 b/templates/apps/drupal/drupal.j2
@@ -134,6 +134,11 @@ location / {
     location ~* ^(?:\/(?:{{ nginx_drupal_language_path_prefixes|join('|') }}))?\/sitemap\.xml$ {
         try_files $uri @drupal-no-args;
     }
+
+    ## Core search support.
+    location ~* ^(?:\/(?:{{ nginx_drupal_language_path_prefixes|join('|') }}))?\/search/.+/.+ {
+        try_files $uri @drupal-no-args;
+    }
     {% endif %}
 
     ## All static files will be served directly.
@@ -152,7 +157,7 @@ location / {
     }
 
     ## Core search support.
-    location ~* (/[[:alpha:]-]+)?/search/.+/.+ {
+    location ~* ^/search/.+/.+ {
         try_files $uri @drupal-no-args;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,11 @@ location / {`
`134`	`134`	`location ~* ^(?:\/(?:{{ nginx_drupal_language_path_prefixes\|join('\|') }}))?\/sitemap\.xml$ {`
`135`	`135`	`try_files $uri @drupal-no-args;`
`136`	`136`	`}`
	`137`	`+`
	`138`	`+ ## Core search support.`
	`139`	`+ location ~* ^(?:\/(?:{{ nginx_drupal_language_path_prefixes\|join('\|') }}))?\/search/.+/.+ {`
	`140`	`+ try_files $uri @drupal-no-args;`
	`141`	`+ }`
`137`	`142`	`{% endif %}`
`138`	`143`
`139`	`144`	`## All static files will be served directly.`
`@@ -152,7 +157,7 @@ location / {`
`152`	`157`	`}`
`153`	`158`
`154`	`159`	`## Core search support.`
`155`		`- location ~* (/[[:alpha:]-]+)?/search/.+/.+ {`
	`160`	`+ location ~* ^/search/.+/.+ {`
`156`	`161`	`try_files $uri @drupal-no-args;`
`157`	`162`	`}`
`158`	`163`