aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Settings
diff options
context:
space:
mode:
authorredmatrix <mike@macgirvin.com>2016-09-25 17:06:13 -0700
committerredmatrix <mike@macgirvin.com>2016-09-25 17:06:13 -0700
commitfb9544badd66043bf7ee5a7566ba288ad7da29fa (patch)
tree3bdb33ed9eef9101f1d6d6972ac9411051b988ce /Zotlabs/Module/Settings
parent4e85bc66b8a5f5347ae15dda229f028d31b58469 (diff)
downloadvolse-hubzilla-fb9544badd66043bf7ee5a7566ba288ad7da29fa.tar.gz
volse-hubzilla-fb9544badd66043bf7ee5a7566ba288ad7da29fa.tar.bz2
volse-hubzilla-fb9544badd66043bf7ee5a7566ba288ad7da29fa.zip
null_date conversion; phase 1
Diffstat (limited to 'Zotlabs/Module/Settings')
-rw-r--r--Zotlabs/Module/Settings/Tokens.php2
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,