diff options
| author | Mike Macgirvin <mike@macgirvin.com> | 2010-08-10 05:58:22 -0700 |
|---|---|---|
| committer | Mike Macgirvin <mike@macgirvin.com> | 2010-08-10 05:58:22 -0700 |
| commit | 04e65823d70d448400d3be7f0b3244ea8658834d (patch) | |
| tree | e0c62cb3493c0026f39ee0077cba67edd935f632 /mod | |
| parent | 503f403b3b2bb45cd98ef8e9d4fd2e2103306019 (diff) | |
| download | volse-hubzilla-04e65823d70d448400d3be7f0b3244ea8658834d.tar.gz volse-hubzilla-04e65823d70d448400d3be7f0b3244ea8658834d.tar.bz2 volse-hubzilla-04e65823d70d448400d3be7f0b3244ea8658834d.zip | |
more post branch bug fixes
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/dfrn_notify.php | 2 | ||||
| -rw-r--r-- | mod/message.php | 6 | ||||
| -rw-r--r-- | mod/photo.php | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index a631434f3..7b73344d6 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -87,7 +87,7 @@ function dfrn_notify_post(&$a) { '$fn' => $r[0]['name'], '$title' => $msg['title'], '$body' => strip_tags(bbcode($msg['body'])) - ); + )); $res = mail($r[0]['email'], t("New mail received at ") . $a->config['sitename'], $email_tpl,t("From: Administrator@") . $_SERVER[SERVER_NAME] ); diff --git a/mod/message.php b/mod/message.php index 3aac2ec28..549ce434d 100644 --- a/mod/message.php +++ b/mod/message.php @@ -54,7 +54,7 @@ function message_post(&$a) { dbesc($subject), dbesc($body), 0, - 0, + 1, 0, dbesc($uri), dbesc($replyto), @@ -144,7 +144,7 @@ function message_content(&$a) { if(($a->argc > 1) && ($a->argv[1] == 'new')) { - $tpl = file_get_contents('view/jot-header.tpl'); + $tpl = file_get_contents('view/msg-header.tpl'); $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl())); @@ -248,7 +248,7 @@ function message_content(&$a) { require_once("include/bbcode.php"); - $tpl = file_get_contents('view/jot-header.tpl'); + $tpl = file_get_contents('view/msg-header.tpl'); $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl())); diff --git a/mod/photo.php b/mod/photo.php index 6e4d981d2..6174b10ab 100644 --- a/mod/photo.php +++ b/mod/photo.php @@ -112,6 +112,9 @@ function photo_init(&$a) { } header("Content-type: image/jpeg"); + header('Expires: ' . datetime_convert('UTC','UTC', 'now + 30 minutes', 'D, d M Y H:i:s' . ' GMT')); + header('Expires: ' . datetime_convert('UTC','UTC', 'now + 30 minutes', 'D, d M Y H:i:s' . ' GMT')); + header("Cache-Control: max-age=3600, must-revalidate"); echo $data; killme(); return; //NOTREACHED |