diff options
| author | zotlabs <mike@macgirvin.com> | 2016-12-27 15:28:52 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-12-27 15:28:52 -0800 |
| commit | db9ea66069f2a2df6044e8267a68eae377c45911 (patch) | |
| tree | aa93597df2ee43ceeaa980db864b58143f2e06df /Zotlabs/Module/Settings/Tokens.php | |
| parent | ef02464e3c3188563349bfda42585ce40cdb45ad (diff) | |
| parent | c2830c4a98cf3c9983b3c4b61024d52a6d7187df (diff) | |
| download | volse-hubzilla-db9ea66069f2a2df6044e8267a68eae377c45911.tar.gz volse-hubzilla-db9ea66069f2a2df6044e8267a68eae377c45911.tar.bz2 volse-hubzilla-db9ea66069f2a2df6044e8267a68eae377c45911.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
Diffstat (limited to 'Zotlabs/Module/Settings/Tokens.php')
| -rw-r--r-- | Zotlabs/Module/Settings/Tokens.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Settings/Tokens.php b/Zotlabs/Module/Settings/Tokens.php index e63fed128..d32a00c95 100644 --- a/Zotlabs/Module/Settings/Tokens.php +++ b/Zotlabs/Module/Settings/Tokens.php @@ -115,6 +115,7 @@ class Tokens { $desc2 = t('You may also provide <em>dropbox</em> style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:'); $global_perms = \Zotlabs\Access\Permissions::Perms(); + $their_perms = []; $existing = get_all_perms(local_channel(),(($atoken_xchan) ? $atoken_xchan : '')); @@ -123,7 +124,6 @@ class Tokens { intval(local_channel()), dbesc($atoken_xchan) ); - $their_perms = array(); if($theirs) { foreach($theirs as $t) { $their_perms[$t['k']] = $t['v']; |