From: Evan Prodromou <evan@status.net>
Date: Fri, 11 Nov 2011 17:35:00 +0000 (-0500)
Subject: use HTTPS for JSON if necessary
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=62fb12b369bbcb4584ff9972074314ac72dd63b8;p=quix0rs-gnu-social.git

use HTTPS for JSON if necessary
---

diff --git a/lib/action.php b/lib/action.php
index 7d4e03915c..4611210422 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').'"); }');
+                    $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.min.js', StatusNet::isHTTP()).'"); }');
                     $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').'"); }');
+                    $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.js', StatusNet::isHTTP()).'"); }');
                     $this->script('jquery.joverlay.js');
                     $this->script('jquery.infieldlabel.js');
                 }