diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ItemObject.php | 1 | ||||
| -rw-r--r-- | include/conversation.php | 3 | ||||
| -rw-r--r-- | include/group.php | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index 94afaaac4..66af01a81 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -215,6 +215,7 @@ class Item extends BaseObject { 'osparkle' => $osparkle, 'sparkle' => $sparkle, 'title' => $item['title'], + 'isotime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'c'), 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'), 'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])), 'lock' => $lock, diff --git a/include/conversation.php b/include/conversation.php index f8507c595..e8c391967 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -618,7 +618,8 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { 'ago' => relative_date($item['created']), 'app' => $item['app'], 'str_app' => sprintf( t(' from %s'), $item['app']), - 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'c'), + 'isotime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'c'), + 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'), 'location' => $location, 'indent' => '', 'owner_name' => $owner_name, diff --git a/include/group.php b/include/group.php index 52a0fe522..d4a01593e 100644 --- a/include/group.php +++ b/include/group.php @@ -221,7 +221,7 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0 $groups = array(); $groups[] = array( - 'text' => t('All Connections'), + 'text' => t('All Channels'), 'id' => 0, 'selected' => (($group_id == 0) ? 'group-selected' : ''), 'href' => $every, |