SSL/HTTPS issue caused by main logo

I just enabled SSL for one of our websites and received a dreaded “Your connection is partially encrypted” error in Firefox. Also known as mixed content. Older IE browsers trigger a warning: “Do you want to view only the webpage content that was delivered securely?”

The error was caused by the main logo, generated by includes\header-navigation.php, but can also mentioned in includes\header-side-nav.php

The fix I applied is manually modifying the DB values hb_logo_option and hb_logo_option_retina from “http” to “https”, but I was wondering if you could implement a permanent fix along the lines of:

if (isset($_SERVER[‘HTTPS’]) && ($_SERVER[“HTTPS”] == “on”)
$logo_url = “https://www.domain.com/uploads/2015/02/logo.jpg
else
$logo_url = “http://www.domain.com/uploads/2015/02/logo.jpg

What do you think?