aboutsummaryrefslogtreecommitdiffstats
path: root/include/deliver.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-12-11 23:13:36 -0800
committerfriendica <info@friendica.com>2013-12-11 23:13:36 -0800
commitb3fe221b7fe9c6ecc151d9c00f36d3913526f6a3 (patch)
tree2f074601c98f8403ba5b6db2a4b76b552ddfa8aa /include/deliver.php
parent18f0ab2605790f616ffd9b7a988e8dbdb10a0157 (diff)
downloadvolse-hubzilla-b3fe221b7fe9c6ecc151d9c00f36d3913526f6a3.tar.gz
volse-hubzilla-b3fe221b7fe9c6ecc151d9c00f36d3913526f6a3.tar.bz2
volse-hubzilla-b3fe221b7fe9c6ecc151d9c00f36d3913526f6a3.zip
issue #240 - we were using htmlentities instead of htmlspecialchars in several places, and this was a bit greedy in the set of characters which were converted from utf-8 to HTML entities. Also brought mail attachments up to date so they are rendered identically to item attachments.
Diffstat (limited to 'include/deliver.php')
-rw-r--r--include/deliver.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/deliver.php b/include/deliver.php
index b1314ce39..b0d15e1ef 100644
--- a/include/deliver.php
+++ b/include/deliver.php
@@ -26,6 +26,7 @@ function deliver_run($argv, $argc) {
// If there is no outq_msg, this is a refresh_all message which does not require local handling
if($r[0]['outq_msg']) {
$msg = array('body' => json_encode(array('pickup' => array(array('notify' => json_decode($r[0]['outq_notify'],true),'message' => json_decode($r[0]['outq_msg'],true))))));
+
zot_import($msg,z_root());
$r = q("delete from outq where outq_hash = '%s' limit 1",
dbesc($argv[$x])