From 316963791029e74a2cda15a254db38d9f8fe7575 Mon Sep 17 00:00:00 2001
From: Li Jianxuan <la5c@qq.com>
Date: Thu, 3 Nov 2011 03:22:47 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=AD=E4=B8=8A=E4=BC=A0=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E8=B7=AF=E5=BE=84=E7=9A=84=E6=9D=A5=E6=BA=90?=
 =?UTF-8?q?(config.ini=E4=B8=AD)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controllers/DataController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php
index f1cba491..276cee31 100755
--- a/application/admin/controllers/DataController.php
+++ b/application/admin/controllers/DataController.php
@@ -1097,7 +1097,7 @@ class Admin_DataController extends Zend_Controller_Action
 			else
 			{
 				$files=new files();
-				$msg = $files -> upload(Zend_Registry::get('upload'),$_FILES['Filedata'],$_POST['dir']);
+				$msg = $files -> upload($this->view->config->upload,$_FILES['Filedata'],$_POST['dir']);
 				
 				if(empty($msg['error']))
 				{