From 4c1fa0a568a7af429767210d261f82a2ad77b419 Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Thu, 21 Jan 2010 04:57:24 +0000
Subject: [PATCH] #18630159 : reorder in prechecker of XmlQueryParser

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7206 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/xml/XmlQueryParser.class.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/classes/xml/XmlQueryParser.class.php b/classes/xml/XmlQueryParser.class.php
index c46f80642..bdc58ef02 100644
--- a/classes/xml/XmlQueryParser.class.php
+++ b/classes/xml/XmlQueryParser.class.php
@@ -202,20 +202,6 @@
                 $buff .= sprintf('$output->groups = array("%s");%s', implode('","',$output->groups),"\n");
             }
 
-            // default check
-            if(count($this->default_list)) {
-                foreach($this->default_list as $key => $val) {
-                    $pre_buff .= 'if(!isset($args->'.$key.')) $args->'.$key.' = '.$val.';'."\n";
-                }
-            }
-
-            // not null check
-            if(count($this->notnull_list)) {
-                foreach($this->notnull_list as $key => $val) {
-                    $pre_buff .= 'if(!isset($args->'.$val.')) return new Object(-1, sprintf($lang->filter->isnull, $lang->'.$val.'?$lang->'.$val.':\''.$val.'\'));'."\n";
-                }
-            }
-
             // minlength check
             if(count($minlength_list)) {
                 foreach($minlength_list as $key => $val) {
@@ -237,6 +223,20 @@
                 }
             }
 
+            // default check
+            if(count($this->default_list)) {
+                foreach($this->default_list as $key => $val) {
+                    $pre_buff .= 'if(!isset($args->'.$key.')) $args->'.$key.' = '.$val.';'."\n";
+                }
+            }
+
+            // not null check
+            if(count($this->notnull_list)) {
+                foreach($this->notnull_list as $key => $val) {
+                    $pre_buff .= 'if(!isset($args->'.$val.')) return new Object(-1, sprintf($lang->filter->isnull, $lang->'.$val.'?$lang->'.$val.':\''.$val.'\'));'."\n";
+                }
+            }
+
             $buff = "<?php if(!defined('__ZBXE__')) exit();\n"
                   . sprintf('$output->query_id = "%s";%s', $query_id, "\n")
                   . sprintf('$output->action = "%s";%s', $action, "\n")