diff options
| author | redmatrix <mike@macgirvin.com> | 2016-09-26 18:17:38 -0700 |
|---|---|---|
| committer | redmatrix <mike@macgirvin.com> | 2016-09-26 18:17:38 -0700 |
| commit | 4663278f52fd11c1014d13151af2bc6ef1392c7d (patch) | |
| tree | 5ea36ed7db723a1d0abfd99c5e7d21f9e72cf12a /Zotlabs/Module/Settings/Tokens.php | |
| parent | 5716556766eb4e329f0c6c1bc899a7621cbcd5a5 (diff) | |
| parent | cacdac16aa104eb1308f69f24fef31f682934fca (diff) | |
| download | volse-hubzilla-4663278f52fd11c1014d13151af2bc6ef1392c7d.tar.gz volse-hubzilla-4663278f52fd11c1014d13151af2bc6ef1392c7d.tar.bz2 volse-hubzilla-4663278f52fd11c1014d13151af2bc6ef1392c7d.zip | |
Merge branch 'nulldate' into dev
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 0ae960785..e63fed128 100644 --- a/Zotlabs/Module/Settings/Tokens.php +++ b/Zotlabs/Module/Settings/Tokens.php @@ -156,7 +156,7 @@ class Tokens { '$url2' => z_root() . '/photos/' . $channel['channel_address'], '$name' => array('name', t('Login Name') . ' <span class="required">*</span>', (($atoken) ? $atoken['atoken_name'] : ''),''), '$token'=> array('token', t('Login Password') . ' <span class="required">*</span>',(($atoken) ? $atoken['atoken_token'] : autoname(8)), ''), - '$expires'=> array('expires', t('Expires (yyyy-mm-dd)'), (($atoken['atoken_expires'] && $atoken['atoken_expires'] != NULL_DATE) ? datetime_convert('UTC',date_default_timezone_get(),$atoken['atoken_expires']) : ''), ''), + '$expires'=> array('expires', t('Expires (yyyy-mm-dd)'), (($atoken['atoken_expires'] && $atoken['atoken_expires'] > NULL_DATE) ? datetime_convert('UTC',date_default_timezone_get(),$atoken['atoken_expires']) : ''), ''), '$them' => t('Their Settings'), '$me' => t('My Settings'), '$perms' => $perms, |