diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-04 11:57:20 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-04 11:57:20 -0800 |
| commit | b2ea61ea3e389cd3ca36a656e6165fb3500035e5 (patch) | |
| tree | 30159d6bcce5abc1fcf53d7aae77daa23ac77ac8 | |
| parent | 47d2467e24a53e54e0322ffc91c4bf64e7027af9 (diff) | |
| parent | 8e1716065ee01959fc799fa14ba627392a876afa (diff) | |
| download | volse-hubzilla-b2ea61ea3e389cd3ca36a656e6165fb3500035e5.tar.gz volse-hubzilla-b2ea61ea3e389cd3ca36a656e6165fb3500035e5.tar.bz2 volse-hubzilla-b2ea61ea3e389cd3ca36a656e6165fb3500035e5.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Zotlabs/Lib/NativeWikiPage.php | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -46,6 +46,7 @@ Hubzilla 2.2 (2017-??-??) - Show webpages link to visitors if a 'home' page exists Bugfixes + - Fix schema not saved if session theme != selected theme and schema select display issue - Fix no acl not detected in post_activity_item() - Fix find_folder_hash_by_path() was not safe against multiple attach structures with the same filename but in different directories - Fix don't search on empty filename - we shouldn't find it. The reason why this change is being made is because we actually did find it due to a development glitch diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php index af0286997..25e454cb7 100644 --- a/Zotlabs/Lib/NativeWikiPage.php +++ b/Zotlabs/Lib/NativeWikiPage.php @@ -188,7 +188,7 @@ class NativeWikiPage { $processed ++; $history[] = [ 'revision' => $item['revision'], - 'date' => datetime_convert('UTC',date_default_timezone_get(),$item['created']), + 'date' => datetime_convert('UTC',date_default_timezone_get(),$item['edited']), 'name' => $item['author']['xchan_name'], 'title' => get_iconfig($item,'nwikipage','commit_msg') ]; |