diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-22 06:37:30 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-22 06:37:30 +0100 |
| commit | b0d5b9fd2c5d5f8eb5a58b36f62dc20d6fa214b3 (patch) | |
| tree | 57247808f666c2dfe689f09f0b35a0d95d958e68 /mod | |
| parent | fb1e6ca6c17dc24cfe29bde375f933822117a9af (diff) | |
| parent | 75468c255a5fcb7d78a95e6c865d4d503efbfbfc (diff) | |
| download | volse-hubzilla-b0d5b9fd2c5d5f8eb5a58b36f62dc20d6fa214b3.tar.gz volse-hubzilla-b0d5b9fd2c5d5f8eb5a58b36f62dc20d6fa214b3.tar.bz2 volse-hubzilla-b0d5b9fd2c5d5f8eb5a58b36f62dc20d6fa214b3.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/lostpass.php | 2 | ||||
| -rw-r--r-- | mod/photos.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mod/lostpass.php b/mod/lostpass.php index 3dbc2fe7d..ffdd7b62e 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -87,7 +87,7 @@ function lostpass_content(&$a) { '$lbl2' => t('Your password has been reset as requested.'), '$lbl3' => t('Your new password is'), '$lbl4' => t('Save or copy your new password - and then'), - '$lbl5' => '<a href="' . $a->get_baseurl() . '">' . t('click here to login') . '</a>.', + '$lbl5' => '<a href="' . $a->get_baseurl() . '/login">' . t('click here to login') . '</a>.', '$lbl6' => t('Your password may be changed from the <em>Settings</em> page after successful login.'), '$newpass' => $new_password, '$baseurl' => $a->get_baseurl() diff --git a/mod/photos.php b/mod/photos.php index b0d9bc631..f1b7aceed 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -463,7 +463,7 @@ function photos_post(&$a) { $_REQUEST['group_deny'] = expand_acl($channel['channel_deny_gid']); } - $r = attach_store($a->channel,get_observer_hash(), '', $_REQUEST); + $r = attach_store($channel,get_observer_hash(), '', $_REQUEST); if(! $r['success']) { notice($r['message'] . EOL); |