From dee59471ae07b3b68fa06b79d118fee11c59ca06 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Thu, 16 Apr 2015 16:22:22 +0000 Subject: [PATCH] Pass mimetype along too as VFS widget and egw_link seem to expect them --- phpgwapi/inc/class.historylog.inc.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/phpgwapi/inc/class.historylog.inc.php b/phpgwapi/inc/class.historylog.inc.php index 7db61086e0..dbbd07157a 100644 --- a/phpgwapi/inc/class.historylog.inc.php +++ b/phpgwapi/inc/class.historylog.inc.php @@ -235,7 +235,7 @@ class historylog { $_query[] = array( 'table' => sqlfs_stream_wrapper::TABLE, - 'cols' =>array('fs_id', 'fs_dir', '"filemanager"','COALESCE(fs_modifier,fs_creator)','"~file~"','fs_name','fs_modified', '""'), + 'cols' =>array('fs_id', 'fs_dir', '"filemanager"','COALESCE(fs_modifier,fs_creator)','"~file~"','fs_name','fs_modified', 'fs_mime'), 'where' => array('fs_dir' => $file['ino']) ); } @@ -270,8 +270,10 @@ class historylog $row['history_new_value'] = array( 'path' => $path, - 'name' => basename($path) + 'name' => basename($path), + 'mime' => $row['history_old_value'] ); + $row['history_old_value'] = ''; if($new_version !== null) { $rows[$new_version]['old_value'] = $row['history_new_value'];