From 67a081753fefe38aeb8aeee1179312e0cd4185ee Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 03 Dec 2009 06:40:59 -0500
Subject: [PATCH] - Net_SMTP 1.3.4

---
 program/include/rcmail.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index a388459..f707e35 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -762,7 +762,7 @@
             continue;
 
           if ($label = $rcube_languages[$name])
-            $sa_languages[$name] = $label ? $label : $name;
+            $sa_languages[$name] = $label;
         }
         closedir($dh);
       }
@@ -1063,7 +1063,7 @@
   {
     $cookie = session_get_cookie_params();
     setcookie($name, $value, $exp, $cookie['path'], $cookie['domain'],
-      ($_SERVER['HTTPS'] && ($_SERVER['HTTPS'] != 'off')));
+      rcube_https_check(), true);
   }
 }
 

--
Gitblit v1.9.1