[SM-CVS] SF.net SVN: squirrelmail:[15011] branches/SM-1_4-ST ABLE/squirrelmail/functions/imap_messages.php

[<pdo...@us...>]

Revision: 15011
          http://sourceforge.net/p/squirrelmail/code/15011
Author:   pdontthink
Date:     2024-03-27 08:43:23 +0000 (Wed, 27 Mar 2024)
Log Message:
-----------
Variable could be null

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php	2024-01-18 00:35:30 UTC (rev 15010)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php	2024-03-27 08:43:23 UTC (rev 15011)
@@ -750,9 +750,11 @@
     }
 
     $internaldate = getPref($data_dir, $username, 'internal_date_sort', SMPREF_ON);
-    $extra_small_header_fields = trim($extra_small_header_fields);
-    if ($extra_small_header_fields !== '')
-        $extra_small_header_fields = ' ' . $extra_small_header_fields;
+    if (!empty($extra_small_header_fields)) {
+        $extra_small_header_fields = trim($extra_small_header_fields);
+        if (!empty($extra_small_header_fields))
+            $extra_small_header_fields = ' ' . $extra_small_header_fields;
+    }
     if ($internaldate) {
         $query = "FETCH $msgs_str (FLAGS UID RFC822.SIZE INTERNALDATE BODY.PEEK[HEADER.FIELDS (Date To Cc From Subject X-Priority Importance Priority Content-Type$extra_small_header_fields)])";
     } else {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.