From 81eb01ed4e4ee93ed47b1b8ee5d64ca533fc95b4 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 13 Apr 2007 08:39:24 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1130
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 classes/db/DBMysql.class.php        | 2 +-
 classes/db/DBMysql_innodb.class.php | 2 +-
 classes/db/DBSqlite2.class.php      | 2 +-
 classes/db/DBSqlite3_pdo.class.php  | 2 +-
 modules/editor/tpl/editor.html      | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php
index 07fdf3df9..6eb7b573f 100644
--- a/classes/db/DBMysql.class.php
+++ b/classes/db/DBMysql.class.php
@@ -285,7 +285,7 @@
                     $name = $v['column'];
                     $operation = $v['operation'];
                     $value = $v['value'];
-                    $type = $output->column_type[$name];
+                    $type = $this->getColumnType($output->column_type,$name);
                     $pipe = $v['pipe'];
 
                     $value = $this->getConditionValue($name, $value, $operation, $type);
diff --git a/classes/db/DBMysql_innodb.class.php b/classes/db/DBMysql_innodb.class.php
index 3243be27a..1ad4ac323 100644
--- a/classes/db/DBMysql_innodb.class.php
+++ b/classes/db/DBMysql_innodb.class.php
@@ -294,7 +294,7 @@
                     $name = $v['column'];
                     $operation = $v['operation'];
                     $value = $v['value'];
-                    $type = $output->column_type[$name];
+                    $type = $this->getColumnType($output->column_type,$name);
                     $pipe = $v['pipe'];
 
                     $value = $this->getConditionValue($name, $value, $operation, $type);
diff --git a/classes/db/DBSqlite2.class.php b/classes/db/DBSqlite2.class.php
index f3e290050..b5a0c1291 100644
--- a/classes/db/DBSqlite2.class.php
+++ b/classes/db/DBSqlite2.class.php
@@ -289,7 +289,7 @@
                     $name = $v['column'];
                     $operation = $v['operation'];
                     $value = $v['value'];
-                    $type = $output->column_type[$name];
+                    $type = $this->getColumnType($output->column_type,$name);
                     $pipe = $v['pipe'];
 
                     $value = $this->getConditionValue($name, $value, $operation, $type);
diff --git a/classes/db/DBSqlite3_pdo.class.php b/classes/db/DBSqlite3_pdo.class.php
index 2a0f40e84..fcaa48117 100644
--- a/classes/db/DBSqlite3_pdo.class.php
+++ b/classes/db/DBSqlite3_pdo.class.php
@@ -316,7 +316,7 @@
                     $name = $v['column'];
                     $operation = $v['operation'];
                     $value = $v['value'];
-                    $type = $output->column_type[$name];
+                    $type = $this->getColumnType($output->column_type,$name);
                     $pipe = $v['pipe'];
 
                     $value = $this->getConditionValue($name, $value, $operation, $type);
diff --git a/modules/editor/tpl/editor.html b/modules/editor/tpl/editor.html
index a613da33f..1ba20a840 100644
--- a/modules/editor/tpl/editor.html
+++ b/modules/editor/tpl/editor.html
@@ -95,6 +95,7 @@
 <!--@if($allow_fileupload)-->
     <!-- 첨부파일 영역 -->
     <!--%import("./js/uploader.js")-->
+    <!--%import("./js/SWFUpload.js")-->
     <script type="text/javascript">
         editor_upload_init("{$upload_target_srl}");
     </script>