forked from GNUsocial/gnu-social
		
	use HTTPS for favicon.ico if page is HTTPS
This commit is contained in:
		@@ -175,8 +175,9 @@ class Action extends HTMLOutputter // lawsuit
 | 
				
			|||||||
            $this->element('link', array('rel' => 'shortcut icon',
 | 
					            $this->element('link', array('rel' => 'shortcut icon',
 | 
				
			||||||
                                         'href' => Theme::path('favicon.ico')));
 | 
					                                         'href' => Theme::path('favicon.ico')));
 | 
				
			||||||
        } else {
 | 
					        } else {
 | 
				
			||||||
 | 
					            // favicon.ico should be HTTPS if the rest of the page is
 | 
				
			||||||
            $this->element('link', array('rel' => 'shortcut icon',
 | 
					            $this->element('link', array('rel' => 'shortcut icon',
 | 
				
			||||||
                                         'href' => common_path('favicon.ico')));
 | 
					                                         'href' => common_path('favicon.ico', StatusNet::isHTTPS())));
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (common_config('site', 'mobile')) {
 | 
					        if (common_config('site', 'mobile')) {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user