aboutsummaryrefslogtreecommitdiffstats
path: root/mod/contacts.php
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2011-02-08 18:13:41 +0100
committerfabrixxm <fabrix.xm@gmail.com>2011-02-08 18:13:41 +0100
commit26dfb73f48d4fcd4671d136e53f52bb81995ea34 (patch)
tree36902abc509c4dbf6abc27fb5ba7997ee921f437 /mod/contacts.php
parent97b608db38edac6e4989c7343e9de8f32f46f263 (diff)
parent9a1e5aaf09c1b940f4615f7dc2999e16b019ab18 (diff)
downloadvolse-hubzilla-26dfb73f48d4fcd4671d136e53f52bb81995ea34.tar.gz
volse-hubzilla-26dfb73f48d4fcd4671d136e53f52bb81995ea34.tar.bz2
volse-hubzilla-26dfb73f48d4fcd4671d136e53f52bb81995ea34.zip
Merge branch 'friendika-master'
Diffstat (limited to 'mod/contacts.php')
-rw-r--r--mod/contacts.php11
1 files changed, 8 insertions, 3 deletions
diff --git a/mod/contacts.php b/mod/contacts.php
index 61d9ce398..36f42f8e5 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -245,6 +245,13 @@ function contacts_content(&$a) {
$sparkle = '';
}
+ $last_update = (($r[0]['last-update'] == '0000-00-00 00:00:00')
+ ? t('Never')
+ : datetime_convert('UTC',date_default_timezone_get(),$r[0]['last-update'],'D, j M Y, g:i A'));
+
+ if($r[0]['last-update'] !== '0000-00-00 00:00:00')
+ $last_update .= ' ' . (($r[0]['last-update'] == $r[0]['success_update']) ? t("\x28Update was successful\x29") : t("\x28Update was not successful\x29"));
+
$o .= replace_macros($tpl,array(
'$header' => t('Contact Editor'),
'$visit' => t('Visit $name\'s profile'),
@@ -254,9 +261,7 @@ function contacts_content(&$a) {
'$poll_interval' => contact_poll_interval($r[0]['priority']),
'$lastupdtext' => t('Last updated: '),
'$updpub' => t('Update public posts: '),
- '$last_update' => (($r[0]['last-update'] == '0000-00-00 00:00:00')
- ? t('Never')
- : datetime_convert('UTC',date_default_timezone_get(),$r[0]['last-update'],'D, j M Y, g:i A')),
+ '$last_update' => $last_update,
'$udnow' => t('Update now'),
'$profile_select' => contact_profile_assign($r[0]['profile-id'],(($r[0]['network'] !== 'dfrn') ? true : false)),
'$contact_id' => $r[0]['id'],