From 0fe53a674b6cf0922c2723cd31e59493053f29d7 Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Thu, 12 Jun 2014 07:07:47 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=89=8D=E5=8F=B0=E5=85=B3?=
 =?UTF-8?q?=E4=BA=8E=E9=83=A8=E5=88=86=E7=9A=84=E5=88=86=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/default/views/scripts/about/contact.phtml | 2 +-
 application/default/views/scripts/about/navi.phtml    | 6 ++----
 application/models/Archive.php                        | 4 +++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/default/views/scripts/about/contact.phtml b/application/default/views/scripts/about/contact.phtml
index 9fdc39c1..bae8dac2 100755
--- a/application/default/views/scripts/about/contact.phtml
+++ b/application/default/views/scripts/about/contact.phtml
@@ -27,7 +27,7 @@ $this->breadcrumb()->setSeparator(' > ');
                                   
             <div id="online">
              <p class="title">在线联系</p>
-             <p class="note">请填写以下表单，系统会自动发送到westdc邮箱里</p>
+             <p class="note">请填写以下表单，系统会自动发送到我们的邮箱</p>
              <?php echo $this->form; ?>
             
              <?php if (!empty($this->messages)) : ?>
diff --git a/application/default/views/scripts/about/navi.phtml b/application/default/views/scripts/about/navi.phtml
index b115d8fd..f7a9eedf 100644
--- a/application/default/views/scripts/about/navi.phtml
+++ b/application/default/views/scripts/about/navi.phtml
@@ -1,9 +1,7 @@
 <div class="sidebar-nav bs-review-nav">
     <ul class="nav nav-list bs-review-sidenav">
-        <li id="Nav-about-index"><a href="/about/"><i class="icon-chevron-right"></i>中心简介</a></li>
-        <li id="Nav-about-honor"><a href="/about/honor"><i class="icon-chevron-right"></i>服务成效</a></li>
-        <li id="Nav-about-copyright"><a href="/about/copyright"><i class="icon-chevron-right"></i>数据与版权</a></li>
-        <li id="Nav-about-legal"><a href="/about/legal"><i class="icon-chevron-right"></i>隐私政策</a></li>
+        <li id="Nav-about-index"><a href="/about/"><i class="icon-chevron-right"></i>简介</a></li>
+        <li id="Nav-about-sponsors"><a href="/about/sponsors"><i class="icon-chevron-right"></i>支持项目</a></li>
         <li id="Nav-about-supportus"><a href="/about/supportus"><i class="icon-chevron-right"></i>支持我们</a></li>
         <li id="Nav-about-contact"><a href="/about/contact"><i class="icon-chevron-right"></i>联系我们</a></li>
         <li id="Nav-about-link"><a href="/about/link"><i class="icon-chevron-right"></i>友情链接</a></li>
diff --git a/application/models/Archive.php b/application/models/Archive.php
index 72e89f3b..5e789522 100644
--- a/application/models/Archive.php
+++ b/application/models/Archive.php
@@ -594,12 +594,14 @@ class Archive
 	//getOneArchive 获取单个文档
 	function getOneArchive($title,$ptype='news')
 	{
+		$config = \Zend_Registry::get('config');
+		$subnews=$config->sub->news;
 		$sql="update ".$this->tbl_archives." set click=click+1";
 		$this->db->query($sql);
 		$sql = "select a.* from ".$this->tbl_archives." a 
 				left join ".$this->tbl_catalog." ac on a.id=ac.aid 
 				left join ".$this->tbl_categorys." c on ac.cid=c.id ";
-		$sql.=" where a.title=? and c.ptype=?";
+		$sql.=" where a.title=? and c.ptype=? and a.sub='$subnews'";
 		$sth=$this->db->prepare($sql);
 		$sth->execute(array($title,$ptype));
 		$rows=$sth->fetch();