merge heihedata branch r3736.
This commit is contained in:
parent
8c41981a6b
commit
47eacc7c14
|
@ -230,11 +230,13 @@ class Admin_DownController extends Zend_Controller_Action
|
||||||
$role['publisher']=array();
|
$role['publisher']=array();
|
||||||
$role['author']=array();
|
$role['author']=array();
|
||||||
$single=array();
|
$single=array();
|
||||||
|
if ($rows)
|
||||||
|
{
|
||||||
foreach($rows as $row)
|
foreach($rows as $row)
|
||||||
{
|
{
|
||||||
if ($tmp_title!=$row['title'])
|
if ($tmp_title!=$row['title'])
|
||||||
{
|
{
|
||||||
if (count($role))
|
if (count($role) && !empty($tmp_title))
|
||||||
{
|
{
|
||||||
$single['role']=$role;
|
$single['role']=$role;
|
||||||
$md[]=$single;
|
$md[]=$single;
|
||||||
|
@ -353,7 +355,7 @@ class Admin_DownController extends Zend_Controller_Action
|
||||||
$mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, 'offlineapp.pdf');
|
$mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, 'offlineapp.pdf');
|
||||||
$mail->send();
|
$mail->send();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
//提示信息
|
//提示信息
|
||||||
|
|
||||||
$data = array(
|
$data = array(
|
||||||
|
|
Loading…
Reference in New Issue