From f8063556732c8c0f60579abe2634105bb5e3bc81 Mon Sep 17 00:00:00 2001
From: Li Jianxuan <la5c@qq.com>
Date: Tue, 12 Jun 2012 01:49:51 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=88=A0=E9=99=A4=E6=97=B6=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controllers/DataController.php   | 6 +++---
 application/admin/views/scripts/data/version.phtml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php
index 031df715..4550e3b6 100755
--- a/application/admin/controllers/DataController.php
+++ b/application/admin/controllers/DataController.php
@@ -1740,11 +1740,11 @@ class Admin_DataController extends Zend_Controller_Action
 		   
 		   if($ex)
 		   {
-			   $data = array("deleted"=>$id,"error"=>$this->alertbox('ok','删除成功'));
+			   $data = array("deleted"=>$id, "error"=>"删除成功");
 			   $this->jsonexit($data);
 				return true;
 		   }else{
-			   $data = array("error"=>$this->alertbox('error','删除失败，请确认权限后重试'));
+			   $data = array("error"=>'删除失败，请确认权限后重试');
 			   $this->jsonexit($data);
 				return true;
 		   }
@@ -1752,7 +1752,7 @@ class Admin_DataController extends Zend_Controller_Action
 			   $msg = "删除失败，请确认权限后重试";
 			   if($this->debug>0)
 			   {$msg .= $e->getMessage();}
-			   $data = array("error"=>$this->alertbox('error',$msg));
+			   $data = array("error"=>$msg);
 			   $this->jsonexit($data);
 				return true;
 		   }
diff --git a/application/admin/views/scripts/data/version.phtml b/application/admin/views/scripts/data/version.phtml
index 9079c067..2576b8de 100644
--- a/application/admin/views/scripts/data/version.phtml
+++ b/application/admin/views/scripts/data/version.phtml
@@ -77,12 +77,12 @@ function action(ac,id){
 			{$('#changelog').val('');$('#commit_submit').attr('onclick','');}
 		  }
 		  else{ 
-		  	$.colorbox({'innerWidth':'50%','html':'<img src="/images/alert_big_warning.png" /><h4>出现错误，请稍候再试</h4>'});
+		  	$.colorbox({'innerWidth':'50%','html':'<h4>出现错误，请稍候再试</h4>'});
 		  }
 	  },
 	  'timeout': 30000,
 	  'error': function(){
-		  $.colorbox({'innerWidth':'50%','html':'<img src="/images/alert_big_error.png" /><h4>处理中出现错误，请刷新页面后重试</h4>'});
+		  $.colorbox({'innerWidth':'50%','html':'<h4>处理中出现错误，请刷新页面后重试</h4>'});
 	   }
   });
 }