[mapserver-commits] r11556 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2011-04-13 08:29:52 -0700 (Wed, 13 Apr 2011)
New Revision: 11556

Modified:
   trunk/mapserver/mapfile.c
Log:
Added web validation block as the second place to check for validation patterns.

Modified: trunk/mapserver/mapfile.c
===================================================================
--- trunk/mapserver/mapfile.c	2011-04-13 15:21:25 UTC (rev 11555)
+++ trunk/mapserver/mapfile.c	2011-04-13 15:29:52 UTC (rev 11556)
@@ -5962,7 +5962,8 @@
           msDebug( "  runtime substitution - Layer %s, tag %s...\n", 
                    layer->name, tag);
 
-      if(msValidateParameter(values[i], msLookupHashTable(&(layer->validation), names[i]), msLookupHashTable(&(layer->metadata), validation_pattern_key), msLookupHashTable(&(map->web.validation), validation_pattern_key), NULL) == MS_SUCCESS) {
+      if(msValidateParameter(values[i], msLookupHashTable(&(layer->validation), names[i]),  msLookupHashTable(&(map->web.validation), names[i]),
+                                        msLookupHashTable(&(layer->metadata), validation_pattern_key), msLookupHashTable(&(map->web.validation), validation_pattern_key)) == MS_SUCCESS) {
         layerSubstituteString(layer, tag, values[i]);
       }
     }