Changeset 1210420

Timestamp:

07/31/2015 03:16:24 PM (11 years ago)

Author:

bendoh

Message:

2.4.1 Release: Fix embedding on https sites

Location:

getty-images/trunk

Files:

• getty-images.php (modified) (1 diff)
• js/getty-models.js (modified) (2 diffs)
• readme.txt (modified) (2 diffs)

getty-images/trunk/getty-images.php

@@ -6 +6 @@
 Author: gettyImages
 Author URI: http://gettyimages.com/
-Version: 2.4.0
+Version: 2.4.1
 */
 

getty-images/trunk/js/getty-models.js

@@ -77 +77 @@
                     // to CreateSession results in an error.
                     if(endpoint != 'CreateSession' && endpoint != 'CreateApplicationSession') {
-                        var tokens = session ? session : getty.user.anonymous;
+                        var tokens = session ? session : getty.anonymous;
 
                         // Choose correct session token based on request protocol
-                        if(url.match(/^https:/) || (url.match(/^\/\//) && location.protocol === 'https:')) {
+                        if(url.match(/^https:/) || (url.match(/^\/\//) && location.protocol === 'https:') && tokens.secure) {
                             payload.RequestHeader.Token = tokens.secure;
                         }
@@ -847 +847 @@
             // Refresh the session only if it's 1 minute before or any time after
             // expiration
-            var session = this.anonymous;
+            var session = getty.anonymous;
 
             if(!session || session.expires < new Date().getTime() / 1000 - 60) {
                 // No session or most definitely timed out session, create a new one
-                var self = this;
-
-                session = this.anonymous = { promise: $.Deferred() };
+                var self = getty;
+
+                session = getty.anonymous = { promise: $.Deferred() };
 
                 api.request('CreateApplicationSession', {

getty-images/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.9
 Tested up to: 4.1
-Stable tag: 2.4.0
+Stable tag: 2.4.1
 License: GPLv2 or later
 
@@ -51 +51 @@
 == Changelog ==
 
+= 2.4.1 =
+* Fix bug that prevented image embed searches from https sites
+
 = 2.4.0 =
 * Provide align and image size display settings for embeddable images