Bug 1262009: Don't attempt to display identity information when we don't have any. draft
authorDave Townsend <dtownsend@oxymoronical.com>
Mon, 04 Apr 2016 16:12:28 -0700
changeset 347648 3a2b2efd08e519b3b2e2fcb2982902c08dfd1ebd
parent 347337 f03e513337dcdd1edff6eff905d7dc90c5f1abc7
child 517680 b6c70881351746a2894d33259c82ab04fef7e7e1
push id14636
push userdtownsend@mozilla.com
push dateTue, 05 Apr 2016 15:29:51 +0000
bugs1262009
milestone48.0a1
Bug 1262009: Don't attempt to display identity information when we don't have any. MozReview-Commit-ID: GVYtSESlWv5
browser/base/content/browser.js
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -6397,21 +6397,21 @@ var gIdentityHandler = {
    */
   _state: 0,
 
   get _isBroken() {
     return this._state & Ci.nsIWebProgressListener.STATE_IS_BROKEN;
   },
 
   get _isSecure() {
-    return this._state & Ci.nsIWebProgressListener.STATE_IS_SECURE;
+    return this._sslStatus && this._state & Ci.nsIWebProgressListener.STATE_IS_SECURE;
   },
 
   get _isEV() {
-    return this._state & Ci.nsIWebProgressListener.STATE_IDENTITY_EV_TOPLEVEL;
+    return this._sslStatus && this._state & Ci.nsIWebProgressListener.STATE_IDENTITY_EV_TOPLEVEL;
   },
 
   get _isMixedActiveContentLoaded() {
     return this._state & Ci.nsIWebProgressListener.STATE_LOADED_MIXED_ACTIVE_CONTENT;
   },
 
   get _isMixedActiveContentBlocked() {
     return this._state & Ci.nsIWebProgressListener.STATE_BLOCKED_MIXED_ACTIVE_CONTENT;