diff --git a/framework/bootstrap/includes/class-Shoestrap_Branding.php b/framework/bootstrap/includes/class-Shoestrap_Branding.php
index c0b5c790e0..57cbf4724f 100755
--- a/framework/bootstrap/includes/class-Shoestrap_Branding.php
+++ b/framework/bootstrap/includes/class-Shoestrap_Branding.php
@@ -48,11 +48,12 @@ function icons() {
public static function logo() {
global $ss_settings;
$logo = $ss_settings['logo'];
-
- $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443) ? "https:" : "http:";
- $logo['url'] = $protocol. str_replace(array('http:', 'https:'), '', $logo['url']);
-
+
if ( ! empty( $logo['url'] ) ) {
+ //added to aid with SSL
+ $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443) ? "https:" : "http:";
+ $logo['url'] = $protocol. str_replace(array('http:', 'https:'), '', $logo['url']);
+
$branding = '';
} else {
$branding = '' . get_bloginfo( 'name' ) . '';
diff --git a/framework/bootstrap/includes/class-Shoestrap_Menus.php b/framework/bootstrap/includes/class-Shoestrap_Menus.php
index 438ae1be52..1986b1a7c3 100755
--- a/framework/bootstrap/includes/class-Shoestrap_Menus.php
+++ b/framework/bootstrap/includes/class-Shoestrap_Menus.php
@@ -182,7 +182,7 @@ function navbar_css() {
* and then add the appropriate logo or sitename.
*/
function navbar_brand() {
- global $ss_settings, $ss_framework;
+ global $ss_settings;
$logo = $ss_settings['logo'];
$branding_class = ! empty( $logo['url'] ) ? 'logo' : 'text';
@@ -190,13 +190,13 @@ function navbar_brand() {
if ( $ss_settings['navbar_brand'] === 'on' ) {
$branding = '';
- $branding .= $ss_settings['navbar_logo'] == 1 ? $ss_framework->logo() : get_bloginfo( 'name' );
+ $branding .= $ss_settings['navbar_logo'] == 1 ? Shoestrap_Branding::logo() : get_bloginfo( 'name' );
$branding .= '';
} elseif ( $ss_settings['navbar_brand'] === 'off' ){
$branding = '';
} elseif ( $ss_settings['navbar_brand'] === 'both' ){
$branding = '';
- $branding .= $ss_framework->logo();
+ $branding .= Shoestrap_Branding::logo();
$branding .= '';
$branding .= '' .get_bloginfo( 'name' ) .'';
}