diff program/lib/Roundcube/rcube_db_pgsql.php @ 18:b631c1c7a3ce

More cleaning up more php8 Warnings/deprecations, including _many_ ediff-based fixes on rcmail_output_html.php
author Charlie Root
date Tue, 07 Oct 2025 11:20:40 -0400
parents 4681f974d28b
children b6a96bdd6b29
line wrap: on
line diff
--- a/program/lib/Roundcube/rcube_db_pgsql.php	Mon Oct 06 12:20:32 2025 -0400
+++ b/program/lib/Roundcube/rcube_db_pgsql.php	Tue Oct 07 11:20:40 2025 -0400
@@ -120,13 +120,15 @@
      */
     public function now($interval = 0)
     {
-        if ($interval) {
-            $add = ' ' . ($interval > 0 ? '+' : '-') . " interval '";
-            $add .= $interval > 0 ? intval($interval) : intval($interval) * -1;
-            $add .= " seconds'";
-        }
+      $result = 'now()';
 
-        return "now()" . $add;
+       if ($interval) {
+	 $result .= ' ' . ($interval > 0 ? '+' : '-') . " interval '";
+	 $result .= $interval > 0 ? intval($interval) : intval($interval) * -1;
+	 $result .= " seconds'";
+       }
+
+       return $result;
     }
 
     /**