Fix for broken pop-ups in wysiwyg editors (Grace)

aegir/conf/nginx_advanced_include.conf

@@ -151,6 +151,15 @@
         try_files $uri =404;
     }
 
+    ###
+    ### allow some known php files (like serve.php in the ad module)
+    ###
+    location ~* /(?:modules|libraries)/(?:ad|tinybrowser|f?ckeditor|tinymce|wysiwyg_spellcheck|ecc)/.*\.php$ {
+        access_log     off;
+        try_files $uri =404;
+        fastcgi_pass   127.0.0.1:9000; ### php-fpm listening on port 9000
+    }
+
     ###
     ### deny listed requests for security reasons without 403 response
     ###
@@ -234,15 +243,6 @@
       access_log  off;
       try_files $uri @cache;
     }
-
-    ###
-    ### allow some known php files (like serve.php in the ad module)
-    ###
-    location ~* /(?:modules|libraries)/(?:ad|tinybrowser|f?ckeditor|tinymce|wysiwyg_spellcheck|ecc)/.*\.php$ {
-        access_log     off;
-        try_files $uri =404;
-        fastcgi_pass   127.0.0.1:9000; ### php-fpm listening on port 9000
-    }
 
     ###
     ### deny direct access to backups
@@ -296,7 +296,7 @@
     ### send all non-static requests to php-fpm, restricted to known php files
     ###    
     location ~* ^/(?:index|boost_stats|update|authorize|rtoc|xmlrpc)\.php$ {
-          try_files $uri @drupal;        ### check for existence of php file first
+          try_files $uri =404;           ### check for existence of php file first
           fastcgi_pass   127.0.0.1:9000; ### php-fpm listening on port 9000
           track_uploads  uploads 60s;    ### required for upload progress
     }

aegir/conf/nginx_compact_include.conf

@@ -27,7 +27,7 @@
     ### send all non-static requests to php-fpm
     ###    
     location ~ \.php$ {
-          try_files $uri @dynamic;        ### check for existence of php file first
+          try_files $uri =404;            ### check for existence of php file first
           fastcgi_pass   127.0.0.1:9000;  ### php-fpm listening on port 9000
     }