aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc/poche/Tools.class.php
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2014-11-15 20:48:49 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2014-11-15 20:48:49 +0100
commit153237671001225dea40957e33e67fe16e6124fc (patch)
tree4f5ec06050233f9cd5740904785edcbc65eb2cd9 /inc/poche/Tools.class.php
parent44d35257e805856b4913c63fcbed3c0acb64bae8 (diff)
parentd3122db7b267b384cd70f368328a9ed024719135 (diff)
downloadwallabag-153237671001225dea40957e33e67fe16e6124fc.tar.gz
wallabag-153237671001225dea40957e33e67fe16e6124fc.tar.zst
wallabag-153237671001225dea40957e33e67fe16e6124fc.zip
Merge pull request #932 from wallabag/dev1.8.1
1.8.1
Diffstat (limited to 'inc/poche/Tools.class.php')
-rwxr-xr-xinc/poche/Tools.class.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 93ec3fc6..f803e3b5 100755
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -51,6 +51,7 @@ final class Tools
51 51
52 $serverport = (!isset($_SERVER["SERVER_PORT"]) 52 $serverport = (!isset($_SERVER["SERVER_PORT"])
53 || $_SERVER["SERVER_PORT"] == '80' 53 || $_SERVER["SERVER_PORT"] == '80'
54 || $_SERVER["SERVER_PORT"] == HTTP_PORT
54 || ($https && $_SERVER["SERVER_PORT"] == '443') 55 || ($https && $_SERVER["SERVER_PORT"] == '443')
55 || ($https && $_SERVER["SERVER_PORT"]==SSL_PORT) //Custom HTTPS port detection 56 || ($https && $_SERVER["SERVER_PORT"]==SSL_PORT) //Custom HTTPS port detection
56 ? '' : ':' . $_SERVER["SERVER_PORT"]); 57 ? '' : ':' . $_SERVER["SERVER_PORT"]);
@@ -116,7 +117,7 @@ final class Tools
116 { 117 {
117 $views = array( 118 $views = array(
118 'install', 'import', 'export', 'config', 'tags', 119 'install', 'import', 'export', 'config', 'tags',
119 'edit-tags', 'view', 'login', 'error' 120 'edit-tags', 'view', 'login', 'error', 'about'
120 ); 121 );
121 122
122 return (in_array($view, $views) ? $view . '.twig' : 'home.twig'); 123 return (in_array($view, $views) ? $view . '.twig' : 'home.twig');