From: Evan Prodromou <evan@status.net>
Date: Thu, 14 Oct 2010 04:50:26 +0000 (-0400)
Subject: use HTTPS for favicon.ico if page is HTTPS
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ca0323d01b9c38fe864c8f902d770061e893708b;p=quix0rs-gnu-social.git

use HTTPS for favicon.ico if page is HTTPS
---

diff --git a/lib/action.php b/lib/action.php
index b05770b152..fcac0e0a7f 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -175,8 +175,9 @@ class Action extends HTMLOutputter // lawsuit
             $this->element('link', array('rel' => 'shortcut icon',
                                          'href' => Theme::path('favicon.ico')));
         } else {
+            // favicon.ico should be HTTPS if the rest of the page is
             $this->element('link', array('rel' => 'shortcut icon',
-                                         'href' => common_path('favicon.ico')));
+                                         'href' => common_path('favicon.ico', StatusNet::isHTTPS())));
         }
 
         if (common_config('site', 'mobile')) {