Fix PHP8 warning (roundcube#9429)

audriga · Apr 29, 2024 · 6342206 · 6342206
1 parent f3e3667
commit 6342206
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -53,7 +53,7 @@
 - Makefile: Use phpDocumentor v3.4 for the Framework docs (#9313)
 - Fix bug where HTML entities in URLs were not decoded on HTML to plain text conversion (#9312)
 - Fix bug in collapsing/expanding folders with some special characters in names (#9324)
-- Fix PHP8 warnings (#9363)
+- Fix PHP8 warnings (#9363, #9365, #9429)
 - Fix missing field labels in CSV import, for some locales (#9393)
 
 ## Release 1.6.6

diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php
@@ -1059,7 +1059,7 @@ protected function extended_search($count = false)
 
         if (!$count && $result) {
             // sorting
-            if ($this->sort_col && $prop['scope'] !== 'base' && !$this->ldap->vlv_active) {
+            if ($this->sort_col && (empty($prop['scope']) || $prop['scope'] !== 'base') && !$this->ldap->vlv_active) {
                 usort($result, [$this, '_entry_sort_cmp']);
             }