Merge branch 'dev' into emded-dependencies

[github/wallabag/wallabag.git] / inc / poche / Tools.class.php

diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 6f2bc6e7208d2f678e272a19735d0718d5961e5b..1d092823fd1cad93b6c342676656ae5abe36e111 100644 (file)
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -42,13 +42,13 @@ class Tools
                     && (strtolower($_SERVER['HTTPS']) == 'on'))
             || (isset($_SERVER["SERVER_PORT"])
                     && $_SERVER["SERVER_PORT"] == '443') // HTTPS detection.
-            || (isset($_SERVER["SERVER_PORT"]) && isset($SSL_PORT) //Custom HTTPS port detection 
-                    && $_SERVER["SERVER_PORT"] == $SSL_PORT);
+            || (isset($_SERVER["SERVER_PORT"]) //Custom HTTPS port detection 
+                    && $_SERVER["SERVER_PORT"] == SSL_PORT);
 
         $serverport = (!isset($_SERVER["SERVER_PORT"])
             || $_SERVER["SERVER_PORT"] == '80'
             || ($https && $_SERVER["SERVER_PORT"] == '443')
-            || ($https && $_SERVER["SERVER_PORT"]==$SSL_PORT) //Custom HTTPS port detection
+            || ($https && $_SERVER["SERVER_PORT"]==SSL_PORT) //Custom HTTPS port detection
             ? '' : ':' . $_SERVER["SERVER_PORT"]);
 
         $scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]);