diff options
| author | Mario <mario@mariovavti.com> | 2020-09-23 12:14:16 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-09-23 14:16:33 +0200 |
| commit | 762de94900aff2bbf3714a150edd611b24a1c354 (patch) | |
| tree | 83e39c98a3f11c09f83068198b40017ee97b5e16 /Zotlabs/Module | |
| parent | d938c793852f097d25c57a81c8004fc8616c1249 (diff) | |
| download | volse-hubzilla-762de94900aff2bbf3714a150edd611b24a1c354.tar.gz volse-hubzilla-762de94900aff2bbf3714a150edd611b24a1c354.tar.bz2 volse-hubzilla-762de94900aff2bbf3714a150edd611b24a1c354.zip | |
5.0RC testing: comment out global remove
(cherry picked from commit 5edec37d571b79dc4fcc30aac1c48b2fc1ae66c9)
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Removeaccount.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Removeme.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Module/Removeaccount.php b/Zotlabs/Module/Removeaccount.php index 9d2bbd0de..cd18b79c0 100644 --- a/Zotlabs/Module/Removeaccount.php +++ b/Zotlabs/Module/Removeaccount.php @@ -37,7 +37,7 @@ class Removeaccount extends \Zotlabs\Web\Controller { } } - $global_remove = intval($_POST['global']); + $global_remove = 0; //intval($_POST['global']); account_remove($account_id, 1 - $global_remove); } @@ -57,7 +57,7 @@ class Removeaccount extends \Zotlabs\Web\Controller { '$title' => t('Remove This Account'), '$desc' => array(t('WARNING: '), t('This account and all its channels will be completely removed from the network. '), t('This action is permanent and can not be undone!')), '$passwd' => t('Please enter your password for verification:'), - '$global' => array('global', t('Remove this account, all its channels and all its channel clones from the network'), false, t('By default only the instances of the channels located on this hub will be removed from the network')), + // '$global' => array('global', t('Remove this account, all its channels and all its channel clones from the network'), false, t('By default only the instances of the channels located on this hub will be removed from the network')), '$submit' => t('Remove Account') )); diff --git a/Zotlabs/Module/Removeme.php b/Zotlabs/Module/Removeme.php index 451e280c3..876d61ca6 100644 --- a/Zotlabs/Module/Removeme.php +++ b/Zotlabs/Module/Removeme.php @@ -37,7 +37,7 @@ class Removeme extends \Zotlabs\Web\Controller { } } - $global_remove = intval($_POST['global']); + $global_remove = 0; //intval($_POST['global']); channel_remove(local_channel(),1 - $global_remove,true); @@ -60,7 +60,7 @@ class Removeme extends \Zotlabs\Web\Controller { '$title' => t('Remove This Channel'), '$desc' => [ t('WARNING: '), t('This channel will be completely removed from the network. '), t('This action is permanent and can not be undone!') ], '$passwd' => t('Please enter your password for verification:'), - '$global' => [ 'global', t('Remove this channel and all its clones from the network'), false, t('By default only the instance of the channel located on this hub will be removed from the network'), [ t('No'),t('Yes') ] ], + // '$global' => [ 'global', t('Remove this channel and all its clones from the network'), false, t('By default only the instance of the channel located on this hub will be removed from the network'), [ t('No'),t('Yes') ] ], '$submit' => t('Remove Channel') )); |