aboutsummaryrefslogtreecommitdiffstats
path: root/mod/notify.php
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-15 01:02:44 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-03-15 01:02:44 -0400
commit6e133e75c3ed12a4637d9cc946b1cb838619b9cc (patch)
tree44eb74a6943ecc26a795f136e79d653c39955d63 /mod/notify.php
parentebccf13c4c883e1438f4446d6aeba070ce6ee967 (diff)
parentb06c5983a4dae26dd24aecd7473bad98558cd6fc (diff)
downloadvolse-hubzilla-6e133e75c3ed12a4637d9cc946b1cb838619b9cc.tar.gz
volse-hubzilla-6e133e75c3ed12a4637d9cc946b1cb838619b9cc.tar.bz2
volse-hubzilla-6e133e75c3ed12a4637d9cc946b1cb838619b9cc.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts roll protocol version due to ssl_policy settings force login to ssl on SSL_POLICY_SELFSIGN basic ssl_policy for important modules ssl_policy stuff revup splitted tests into several files removed done TODO get_tags tests corrected. They test for the right things now. addon settings form error more work on filer, comment level and file tag removal added slack-NS, non-scrolly, slackr-based theme. get tags test improved splitted test cases. changed a test string added some tests added library and include to .htaccess excludes reports from git better tests added test blueprints, fixed? encoding issues * master:
Diffstat (limited to 'mod/notify.php')
-rw-r--r--mod/notify.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/notify.php b/mod/notify.php
index a572b1534..ae8273a1d 100644
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -20,7 +20,7 @@ function notify_init(&$a) {
goaway($r[0]['link']);
}
- goaway($a->get_baseurl());
+ goaway($a->get_baseurl(true));
}
if($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all' ) {
@@ -51,7 +51,7 @@ function notify_content(&$a) {
if (count($r) > 0) {
foreach ($r as $it) {
$notif_content .= replace_macros($not_tpl,array(
- '$item_link' => $a->get_baseurl().'/notify/view/'. $it['id'],
+ '$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'],
'$item_image' => $it['photo'],
'$item_text' => strip_tags(bbcode($it['msg'])),
'$item_when' => relative_date($it['date'])