Merge branch '2024.11'

tine-groupware · Feb 10, 2025 · bb4f4fd · bb4f4fd
2 parents 7e27b64 + 7eb083b
commit bb4f4fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ci/dockerimage/Dockerfile b/ci/dockerimage/Dockerfile
@@ -124,7 +124,7 @@ COPY --from=gomplate /bin/gomplate /usr/bin/gomplate
 RUN mkdir /usr/local/busybox \
  && busybox --install /usr/local/busybox
 ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/busybox
-RUN wget -O /usr/local/bin/tika.jar https://dlcdn.apache.org/tika/2.9.2/tika-app-2.9.2.jar
+RUN wget -O /usr/local/bin/tika.jar https://dlcdn.apache.org/tika/2.9.3/tika-app-2.9.3.jar
 RUN addgroup --system -gid 150 tine20 && \
     adduser --system --no-create-home --disabled-password --shell /bin/bash --gecos "tine20 user" --ingroup tine20 --uid 150 tine20 && \
     mkdir -p /etc/tine20/conf.d && \

diff --git a/tine20/Tinebase/Group/Ldap.php b/tine20/Tinebase/Group/Ldap.php
@@ -1069,6 +1069,9 @@ public function resolveUUIdToGIdNumber($_uuid)
     public function getGroupMembershipsFromSyncBackend($_userId)
     {
         if ($this->isDisabledBackend()) {
+            if (Tinebase_Core::isLogLevel(Zend_Log::DEBUG)) {
+                Tinebase_Core::getLogger()->debug(__METHOD__ . '::' . __LINE__ . ' isDisabledBackend');
+            }
             return [];
         }