bob
/
westdc-zf1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge heihedata branch to trunk from r4112 to r4116

This commit is contained in:
wlx 2013-11-29 02:30:29 +00:00
parent 8c2b1e4b74
commit 6b4e98b87a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/default/controllers/AboutController.php
View File

@ -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();

2
application/module/Helpers/Curl.php
View File

@ -9,7 +9,7 @@ class Curl
public function __construct($options = array())
{
$this->initOptions($options);
}
public function initOptions($options = array())