Merge branch '2.1.x' into 2.2.x

grails · Nov 19, 2012 · 26ce032 · 26ce032
2 parents 12770f5 + 5de8f1e
commit 26ce032
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...src/main/groovy/org/codehaus/groovy/grails/plugins/web/ServletsGrailsPluginSupport.groovy b/...src/main/groovy/org/codehaus/groovy/grails/plugins/web/ServletsGrailsPluginSupport.groovy
@@ -35,7 +35,7 @@ class ServletsGrailsPluginSupport {
     static enhanceServletApi(ConfigObject config = new ConfigObject()) {
         def requestEnhancer = new MetaClassEnhancer()
         final servletRequestApi = new ServletRequestApi()
-        final xhrIdentifier = grails?.web?.xhr?.identifier
+        final xhrIdentifier = config?.grails?.web?.xhr?.identifier
         if(xhrIdentifier instanceof Closure) {
             servletRequestApi.xhrRequestIdentifier = xhrIdentifier
         }