From 70eb46f5417e208060bc8936121e3d3d1173255e Mon Sep 17 00:00:00 2001 From: wlx Date: Tue, 25 Feb 2014 04:12:57 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3docAction=E5=92=8CodtAction?= =?UTF-8?q?=E4=B8=AD=E6=95=B0=E6=8D=AE=E5=BC=95=E7=94=A8=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../default/controllers/ServiceController.php | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/application/default/controllers/ServiceController.php b/application/default/controllers/ServiceController.php index a8301e89..1167a21d 100644 --- a/application/default/controllers/ServiceController.php +++ b/application/default/controllers/ServiceController.php @@ -314,11 +314,8 @@ class ServiceController extends Zend_Controller_Action $citation=$row['mcitation']; } else if ($row['citation']) { - if (empty($row['datadoi'])) - { - $citation=$row['citation']; - } - elseif (!strpos($row['citation'],$row['datadoi'])) + $citation=$row['citation']; + if (!empty($row['datadoi']) && !strpos($row['citation'],$row['datadoi'])) { $citation='
  • 文章引用：'.$row['citation'].'
    • '; $citation.="
  • 数据的引用："; @@ -722,11 +719,8 @@ class ServiceController extends Zend_Controller_Action $cit=$row['mcitation']; } else if ($row['citation']) { - if (empty($row['datadoi'])) - { - $cit=$row['citation']; - } - elseif (!strpos($row['citation'],$row['datadoi'])) + $cit=$row['citation']; + if (!empty($row['datadoi']) && !strpos($row['citation'],$row['datadoi'])) { $cit='文章引用：'.$row['citation']; $cit.="\r\n数据的引用：";