Page MenuHomePhorge

Failed to build roundcubemail package
Open, 40Public

Description

After recent changes https://obs.kolabsys.com/package/view_file/Kolab:Winterfell/roundcubemail/ticket-466-changes.patch does not apply anymore. This is in Winterfell, but will probably exist in KE14 and K16 too.

Here's the new version of the patch:

diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php
index 999bfee..aa0786d 100644
--- a/program/lib/Roundcube/rcube_ldap.php
+++ b/program/lib/Roundcube/rcube_ldap.php
@@ -925,7 +925,7 @@ class rcube_ldap extends rcube_addressbook
 
             // add general filter to query
             if (!empty($this->prop['filter'])) {
-                $prop['filter'] = '(&(' . preg_replace('/^\(|\)$/', '', $this->prop['filter']) . ')' . $prop['filter'] . ')';
+                $prop['filter'] = '(&(' . preg_replace('/^\(|\)$/', '', $this->prop['adv_filter'] ?: $this->prop['filter']) . ')' . $prop['filter'] . ')';
             }
         }

Details

Ticket Type
Task