Projects
Kolab:Winterfell
roundcubemail-plugins-kolab
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 124
View file
roundcubemail-plugins-kolab.spec
Changed
@@ -61,7 +61,8 @@ Source103: plesk.kolab_folders.inc.php Source104: plesk.libkolab.inc.php -Patch1001: roundcubemail-plugins-kolab-3.4-kolab-files-manticore-api.patch +Patch0000: roundcubemail-plugins-kolab-3.4-kolab-files-manticore-api.patch +Patch0001: 0001-Fix-setting-fileid-on-file-objects-Bifrost-T227815.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch @@ -1405,7 +1406,8 @@ cp -afv %{SOURCE104} plugins/libkolab/config.inc.php.dist %endif -%patch1001 -p1 +%patch0000 -p1 +%patch0001 -p1 find -type d -name "helpdocs" -exec rm -rvf {} \; 2>/dev/null || : @@ -2792,6 +2794,9 @@ %defattr(-,root,root,-) %changelog +* Fri Aug 16 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.5.0-2 +- Fix setting 'fileid' on file objects (Bifrost#T227815) + * Mon Jul 1 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.5.0-1 - Release of version 3.5.0
View file
0001-Fix-setting-fileid-on-file-objects-Bifrost-T227815.patch
Added
@@ -0,0 +1,37 @@ +From 6ba98384670aafbe0895b81aea7bb9bf32d7ced1 Mon Sep 17 00:00:00 2001 +From: Aleksander Machniak <machniak@kolabsys.com> +Date: Mon, 15 Jul 2019 11:21:30 +0000 +Subject: [PATCH 1/3] Fix setting 'fileid' on file objects (Bifrost#T227815) + +--- + plugins/libkolab/lib/kolab_storage_cache_file.php | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +diff --git a/plugins/libkolab/lib/kolab_storage_cache_file.php b/plugins/libkolab/lib/kolab_storage_cache_file.php +index 1f3d4d92..b62c0f7a 100644 +--- a/plugins/libkolab/lib/kolab_storage_cache_file.php ++++ b/plugins/libkolab/lib/kolab_storage_cache_file.php +@@ -61,15 +61,12 @@ class kolab_storage_cache_file extends kolab_storage_cache + { + $object = parent::_unserialize($sql_arr); + +- if ($object && $sql_arr['fast-mode']) { +- if (!empty($object['_attachments'])) { +- $file = $object['_attachments'][key($object['_attachments'])]; ++ if ($object && !empty($object['_attachments'])) { ++ $file = $object['_attachments'][key($object['_attachments'])]; + +- $object['type'] = $file['mimetype']; +- $object['size'] = $file['size']; +- $object['fileid'] = $file['id']; +- $object['filename'] = $file['name']; +- } ++ $object['type'] = $file['mimetype']; ++ $object['size'] = $file['size']; ++ $object['fileid'] = $file['id']; + } + + return $object; +-- +2.21.0 +
View file
debian.changelog
Changed
@@ -1,3 +1,9 @@ +roundcubemail-plugins-kolab (1:3.5.0-0~kolab3) unstable; urgency=low + + * Fix setting 'fileid' on file objects (Bifrost#T227815) + + -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Fri, 16 Aug 2019 11:11:11 +0200 + roundcubemail-plugins-kolab (1:3.5.0-0~kolab2) unstable; urgency=low * Release of version 3.5.0
View file
debian.series
Changed
@@ -1,1 +1,2 @@ roundcubemail-plugins-kolab-3.4-kolab-files-manticore-api.patch -p1 +0001-Fix-setting-fileid-on-file-objects-Bifrost-T227815.patch -p1
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.