From 6b4e98b87a952f1517ffb83133b35658525b3df1 Mon Sep 17 00:00:00 2001 From: wlx Date: Fri, 29 Nov 2013 02:30:29 +0000 Subject: [PATCH] merge heihedata branch to trunk from r4112 to r4116 --- application/default/controllers/AboutController.php | 2 +- application/module/Helpers/Curl.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/default/controllers/AboutController.php b/application/default/controllers/AboutController.php index 1c3b1f90..963ef9a1 100755 --- a/application/default/controllers/AboutController.php +++ b/application/default/controllers/AboutController.php @@ -90,7 +90,7 @@ class AboutController extends Zend_Controller_Action $siteid="e31f5ea7-a4af-4ae3-9ac1-1a84132c4338";//site uuid from geonetowrk if(empty($ac)) { - $sql="select * from mdref mr left join reference r on mr.refid=r.id where mr.uuid=? order by r.id desc"; + $sql="select * from mdref mr left join reference r on mr.refid=r.id where mr.uuid=? and mr.reftype=0 order by r.year desc,r.title asc"; $sth = $this->db->prepare($sql); $sth->execute(array($siteid)); $rows = $sth->fetchAll(); diff --git a/application/module/Helpers/Curl.php b/application/module/Helpers/Curl.php index f801e43d..b36ad768 100644 --- a/application/module/Helpers/Curl.php +++ b/application/module/Helpers/Curl.php @@ -9,7 +9,7 @@ class Curl public function __construct($options = array()) { - + $this->initOptions($options); } public function initOptions($options = array())