From cab76836cb97c3bc36f6efa74c045f0c2d12c49e Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 11 Nov 2011 12:44:42 -0500 Subject: [PATCH] isHTTP() -> isHTTPS() --- lib/action.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/action.php b/lib/action.php index 4611210422..0563fe2163 100644 --- a/lib/action.php +++ b/lib/action.php @@ -302,7 +302,7 @@ class Action extends HTMLOutputter // lawsuit $this->script('jquery.form.min.js'); $this->script('jquery-ui.min.js'); $this->script('jquery.cookie.min.js'); - $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.min.js', StatusNet::isHTTP()).'"); }'); + $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.min.js', StatusNet::isHTTPS()).'"); }'); $this->script('jquery.joverlay.min.js'); $this->script('jquery.infieldlabel.min.js'); } else { @@ -310,7 +310,7 @@ class Action extends HTMLOutputter // lawsuit $this->script('jquery.form.js'); $this->script('jquery-ui.min.js'); $this->script('jquery.cookie.js'); - $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.js', StatusNet::isHTTP()).'"); }'); + $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.js', StatusNet::isHTTPS()).'"); }'); $this->script('jquery.joverlay.js'); $this->script('jquery.infieldlabel.js'); } -- 2.39.5