Merge pull request #3307 from rebeka-catalina/space_before_t

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index a2a77e2a5cddaa725e106e3ca1a86ad8fd77b86b..f2500099c3f44689b37f67b4faf3afb7320ce3dd 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -534,13 +534,13 @@ function contacts_content(App $a) {
 
                $insecure = t('Private communications are not available for this contact.');
 
-               $last_update = (($contact['last-update'] == '0000-00-00 00:00:00')
+               $last_update = (($contact['last-update'] <= NULL_DATE)
                                ? t('Never')
                                : datetime_convert('UTC',date_default_timezone_get(),$contact['last-update'],'D, j M Y, g:i A'));
 
-               if($contact['last-update'] !== '0000-00-00 00:00:00')
+               if ($contact['last-update'] > NULL_DATE) {
                        $last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? t("\x28Update was successful\x29") : t("\x28Update was not successful\x29"));
-
+               }
                $lblsuggest = (($contact['network'] === NETWORK_DFRN) ? t('Suggest friends') : '');
 
                $poll_enabled = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2));
@@ -558,12 +558,12 @@ function contacts_content(App $a) {
                // tabs
                $tab_str = contacts_tab($a, $contact_id, 2);
 
-               $lost_contact = (($contact['archive'] && $contact['term-date'] != '0000-00-00 00:00:00' && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : '');
+               $lost_contact = (($contact['archive'] && $contact['term-date'] > NULL_DATE && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : '');
 
-               if ($contact['network'] == NETWORK_FEED)
+               if ($contact['network'] == NETWORK_FEED) {
                        $fetch_further_information = array('fetch_further_information', t('Fetch further information for feeds'), $contact['fetch_further_information'], t('Fetch further information for feeds'),
                                                                        array('0'=>t('Disabled'), '1'=>t('Fetch information'), '2'=>t('Fetch information and keywords')));
-
+               }
                if (in_array($contact['network'], array(NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2)))
                        $poll_interval = contact_poll_interval($contact['priority'],(! $poll_enabled));