use HTTPS for favicon.ico if page is HTTPS

diff --git a/lib/action.php b/lib/action.php
index b05770b152618c53c17c4498b4dece1ebb1bc3b9..fcac0e0a7fdd73f15901bc64942b8b78e3877d5b 100644 (file)
--- 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')) {