extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 00:29:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

buffer empty headers on get_content, if this happens something failed! quiten error log on failed js_link_registry load flag

Browse Source
This commit is contained in:
Klaus Leithoff 2013-07-18 08:12:09 +00:00
parent 88f866aec9
commit c1a2447a5a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail/inc/class.mail_bo.inc.php
View File

@ -4524,16 +4524,17 @@ class mail_bo
* @param partid the partid of the email * @param partid the partid of the email
* @param mailbox the mailbox, that holds the message * @param mailbox the mailbox, that holds the message
* @param preserveHTML flag to pass through to getdisplayableBody * @param preserveHTML flag to pass through to getdisplayableBody
* @return array with 'mailaddress'=>$mailaddress, * @return array/bool with 'mailaddress'=>$mailaddress,
* 'subject'=>$subject, * 'subject'=>$subject,
* 'message'=>$message, * 'message'=>$message,
* 'attachments'=>$attachments, * 'attachments'=>$attachments,
* 'headers'=>$headers, * 'headers'=>$headers,; boolean false on failure
*/ */
static function get_mailcontent(&$mailClass,$uid,$partid='',$mailbox='', $preserveHTML = false) static function get_mailcontent(&$mailClass,$uid,$partid='',$mailbox='', $preserveHTML = false)
{ {
//echo __METHOD__." called for $uid,$partid <br>"; //echo __METHOD__." called for $uid,$partid <br>";
$headers = $mailClass->getMessageHeader($uid,$partid,true); $headers = $mailClass->getMessageHeader($uid,$partid,true);
if (empty($headers)) return false;
// dont force retrieval of the textpart, let mailClass preferences decide // dont force retrieval of the textpart, let mailClass preferences decide
$bodyParts = $mailClass->getMessageBody($uid,($preserveHTML?'always_display':'only_if_no_text'),$partid); $bodyParts = $mailClass->getMessageBody($uid,($preserveHTML?'always_display':'only_if_no_text'),$partid);
//error_log(array2string($bodyParts)); //error_log(array2string($bodyParts));

2
mail/inc/class.mail_ui.inc.php
View File

@ -94,7 +94,7 @@ class mail_ui
{ {
if (!isset($GLOBALS['egw_info']['flags']['js_link_registry'])) if (!isset($GLOBALS['egw_info']['flags']['js_link_registry']))
{ {
error_log(__METHOD__.__LINE__.' js_link_registry not set, force it:'.array2string($GLOBALS['egw_info']['flags']['js_link_registry'])); //error_log(__METHOD__.__LINE__.' js_link_registry not set, force it:'.array2string($GLOBALS['egw_info']['flags']['js_link_registry']));
$GLOBALS['egw_info']['flags']['js_link_registry']=true; $GLOBALS['egw_info']['flags']['js_link_registry']=true;
} }
// no autohide of the sidebox, as we use it for folderlist now. // no autohide of the sidebox, as we use it for folderlist now.