diff options
| author | Evan Prodromou <evan@status.net> | 2010-10-14 00:50:26 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-10-14 00:50:26 -0400 |
| commit | ca0323d01b9c38fe864c8f902d770061e893708b (patch) | |
| tree | 309d31c1f9edf82f1839916fa3984ec88d33e9f0 /lib/action.php | |
| parent | d91f894ccbeed6612727c3fb3bffa3504a14ecea (diff) | |
use HTTPS for favicon.ico if page is HTTPS
Diffstat (limited to 'lib/action.php')
| -rw-r--r-- | lib/action.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/action.php b/lib/action.php index b05770b15..fcac0e0a7 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')) { |