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 /Zotlabs/Module | |
| 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 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Admin/Accounts.php | 7 | ||||
| -rw-r--r-- | Zotlabs/Module/Item.php | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Zotlabs/Module/Admin/Accounts.php b/Zotlabs/Module/Admin/Accounts.php index 2043550fc..2e417edd1 100644 --- a/Zotlabs/Module/Admin/Accounts.php +++ b/Zotlabs/Module/Admin/Accounts.php @@ -16,6 +16,7 @@ class Accounts { */ function post() { + $pending = ( x($_POST, 'pending') ? $_POST['pending'] : array() ); $users = ( x($_POST, 'user') ? $_POST['user'] : array() ); $blocked = ( x($_POST, 'blocked') ? $_POST['blocked'] : array() ); @@ -24,7 +25,7 @@ class Accounts { // change to switch structure? // account block/unblock button was submitted - if (x($_POST, 'page_users_block')) { + if (x($_POST, 'page_accounts_block')) { for ($i = 0; $i < count($users); $i++) { // if account is blocked remove blocked bit-flag, otherwise add blocked bit-flag $op = ($blocked[$i]) ? '& ~' : '| '; @@ -43,13 +44,13 @@ class Accounts { notice( sprintf( tt("%s account deleted", "%s accounts deleted", count($users)), count($users)) ); } // registration approved button was submitted - if (x($_POST, 'page_users_approve')) { + if (x($_POST, 'page_accounts_approve')) { foreach ($pending as $hash) { account_allow($hash); } } // registration deny button was submitted - if (x($_POST, 'page_users_deny')) { + if (x($_POST, 'page_accounts_deny')) { foreach ($pending as $hash) { account_deny($hash); } diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index ad829137a..db2d64d70 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -753,6 +753,7 @@ class Item extends \Zotlabs\Web\Controller { if ((! $plink) && ($item_thread_top)) { $plink = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $mid; + $plink = substr($plink,0,190); } $datarray['aid'] = $channel['channel_account_id']; |