diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-01-30 14:31:06 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-01-30 14:31:06 +0100 |
| commit | d24cf0b85b24cb8d6d10e9fe66fed568f9fb08b2 (patch) | |
| tree | 470336bcbdf0f989d48fb2c3349bd0ac0513da42 /include | |
| parent | 296117124c530ce7533431e6bb8a7958b89f7f51 (diff) | |
| parent | 0e2c539d93e36db0b095e1dcd5080ce2b5fec1d7 (diff) | |
| download | volse-hubzilla-d24cf0b85b24cb8d6d10e9fe66fed568f9fb08b2.tar.gz volse-hubzilla-d24cf0b85b24cb8d6d10e9fe66fed568f9fb08b2.tar.bz2 volse-hubzilla-d24cf0b85b24cb8d6d10e9fe66fed568f9fb08b2.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/auth.php | 1 | ||||
| -rwxr-xr-x | include/items.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/auth.php b/include/auth.php index 78be32bf4..6f5e58361 100644 --- a/include/auth.php +++ b/include/auth.php @@ -261,6 +261,7 @@ else { $verify = account_verify_password($_POST['username'], $_POST['password']); if($verify && array_key_exists('reason',$verify) && $verify['reason'] === 'unvalidated') { notice( t('Email validation is incomplete. Please check your email.')); + goaway(z_root() . '/email_validation/' . bin2hex(trim(escape_tags($_POST['username'])))); } elseif($verify) { $atoken = $verify['xchan']; diff --git a/include/items.php b/include/items.php index b12ad1d85..c7206458e 100755 --- a/include/items.php +++ b/include/items.php @@ -390,7 +390,7 @@ function post_activity_item($arr, $allow_code = false, $deliver = true) { $arr['comment_policy'] = map_scope(\Zotlabs\Access\PermissionLimits::Get($channel['channel_id'],'post_comments')); if ((! $arr['plink']) && (intval($arr['item_thread_top']))) { - $arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . urlencode($arr['mid']); + $arr['plink'] = substr(z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . urlencode($arr['mid']),0,190); } |