From cdeb3f36ccbf6cb62e9f4c01e302876f0c118222 Mon Sep 17 00:00:00 2001
From: ngleader <ngleader@gmail.com>
Date: Tue, 26 May 2009 01:58:26 +0000
Subject: [PATCH] for textyle trash function

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6405 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/document/document.admin.controller.php     |  6 +++++-
 modules/document/queries/getTrashByDocumentSrl.xml | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 modules/document/queries/getTrashByDocumentSrl.xml

diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php
index e964ff1ac..681f97011 100644
--- a/modules/document/document.admin.controller.php
+++ b/modules/document/document.admin.controller.php
@@ -469,7 +469,10 @@
 
         function procDocumentAdminRestoreTrash() {
             $trash_srl = Context::get('trash_srl');
+			$this->restoreTrash($trash_srl);
+        }
 
+		function restoreTrash($trash_srl){
             $oDB = &DB::getInstance();
 
             $trash_args->trash_srl = $trash_srl;
@@ -499,7 +502,8 @@
 
             // commit
             $oDB->commit();
-        }
+			return $output;
+		}
 
     }
 ?>
diff --git a/modules/document/queries/getTrashByDocumentSrl.xml b/modules/document/queries/getTrashByDocumentSrl.xml
new file mode 100644
index 000000000..cc5b463df
--- /dev/null
+++ b/modules/document/queries/getTrashByDocumentSrl.xml
@@ -0,0 +1,11 @@
+<query id="getTrashByDocumentSrl" action="select">
+    <tables>
+        <table name="document_trash" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
+    </conditions>
+</query>