diff options
| author | Mario <mario@mariovavti.com> | 2019-05-29 09:06:52 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-05-29 09:06:52 +0200 |
| commit | 767a235611012200c6767ca602d736e7ab3b8b40 (patch) | |
| tree | 02e161ec42c61fed13ac5020a0a0f0b3dda1f887 /include | |
| parent | ca8d252ad75306e6d3cd066d5c593e94de1dfbdd (diff) | |
| parent | 620fc06b6cd068d6819e1613c4ef0ad10f3ba2a6 (diff) | |
| download | volse-hubzilla-767a235611012200c6767ca602d736e7ab3b8b40.tar.gz volse-hubzilla-767a235611012200c6767ca602d736e7ab3b8b40.tar.bz2 volse-hubzilla-767a235611012200c6767ca602d736e7ab3b8b40.zip | |
Merge branch 'dev' into 'dev'
support 'expires' over Zot6
See merge request hubzilla/core!1661
Diffstat (limited to 'include')
| -rw-r--r-- | include/import.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/import.php b/include/import.php index 92ba014d8..4da0d1a0b 100644 --- a/include/import.php +++ b/include/import.php @@ -897,9 +897,9 @@ function import_menus($channel, $menus) { $m['menu_name'] = $menu['pagetitle']; $m['menu_desc'] = $menu['desc']; if($menu['created']) - $m['menu_created'] = datetime_convert($menu['created']); + $m['menu_created'] = datetime_convert('UTC','UTC',$menu['created']); if($menu['edited']) - $m['menu_edited'] = datetime_convert($menu['edited']); + $m['menu_edited'] = datetime_convert('UTC','UTC',$menu['edited']); $m['menu_flags'] = 0; if($menu['flags']) { @@ -955,9 +955,9 @@ function sync_menus($channel, $menus) { $m['menu_name'] = $menu['pagetitle']; $m['menu_desc'] = $menu['desc']; if($menu['created']) - $m['menu_created'] = datetime_convert($menu['created']); + $m['menu_created'] = datetime_convert('UTC','UTC',$menu['created']); if($menu['edited']) - $m['menu_edited'] = datetime_convert($menu['edited']); + $m['menu_edited'] = datetime_convert('UTC','UTC',$menu['edited']); $m['menu_flags'] = 0; if($menu['flags']) { @@ -1643,12 +1643,12 @@ function import_webpage_element($element, $channel, $type) { $arr['created'] = $iteminfo[0]['created']; } else { // otherwise, generate the creation times and unique id - $arr['created'] = datetime_convert('UTC', 'UTC'); + $arr['created'] = datetime_convert(); $arr['uuid'] = item_message_id(); $arr['mid'] = $arr['parent_mid'] = z_root() . '/item/' . $arr['uuid']; } // Update the edited time whether or not the element already exists - $arr['edited'] = datetime_convert('UTC', 'UTC'); + $arr['edited'] = datetime_convert(); // Import the actual element content $arr['body'] = file_get_contents($element['path']); // The element owner is the channel importing the elements |