diff options
author | zotlabs <mike@macgirvin.com> | 2019-03-16 15:23:17 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2019-03-16 15:23:17 -0700 |
commit | 3c701e780c31a497c8c81ad0a66221e90b6078a4 (patch) | |
tree | 39298f4987e67b9f80742141e35dd6285cd31847 | |
parent | 8ebc517b4174c400009300e1c13f2f95ba78353b (diff) | |
download | volse-hubzilla-3c701e780c31a497c8c81ad0a66221e90b6078a4.tar.gz volse-hubzilla-3c701e780c31a497c8c81ad0a66221e90b6078a4.tar.bz2 volse-hubzilla-3c701e780c31a497c8c81ad0a66221e90b6078a4.zip |
use the php_eol constant for encoded subjects
-rw-r--r-- | Zotlabs/Module/Dreport.php | 1 | ||||
-rw-r--r-- | include/network.php | 2 | ||||
-rw-r--r-- | view/tpl/dreport.tpl | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Module/Dreport.php b/Zotlabs/Module/Dreport.php index 2c125b7a9..e45f49d7c 100644 --- a/Zotlabs/Module/Dreport.php +++ b/Zotlabs/Module/Dreport.php @@ -159,6 +159,7 @@ class Dreport extends \Zotlabs\Web\Controller { '$title' => sprintf( t('Delivery report for %1$s'),basename($mid)) . '...', '$table' => $table, '$mid' => urlencode($mid), + '$safe_mid' => urlencode(gen_link_id($mid)), '$options' => t('Options'), '$push' => t('Redeliver'), '$entries' => $entries diff --git a/include/network.php b/include/network.php index 3e8134a32..4ef976df0 100644 --- a/include/network.php +++ b/include/network.php @@ -895,7 +895,7 @@ function email_header_encode($in_str, $charset = 'UTF-8', $header = 'Subject') { // define start delimimter, end delimiter and spacer $end = "?="; $start = "=?" . $charset . "?B?"; - $spacer = $end . "\r\n " . $start; + $spacer = $end . PHP_EOL . " " . $start; // determine length of encoded text within chunks // and ensure length is even diff --git a/view/tpl/dreport.tpl b/view/tpl/dreport.tpl index 1f5915609..8e52f33bc 100644 --- a/view/tpl/dreport.tpl +++ b/view/tpl/dreport.tpl @@ -6,7 +6,7 @@ <i class="fa fa-sort-desc"></i> </button> <ul class="dropdown-menu"> - <li><a href="dreport/push/{{$mid}}">{{$push}}</a></li> + <li><a href="dreport/push/{{$safe_mid}}">{{$push}}</a></li> </ul> </div> {{/if}} |