Merge lp:~therp-nl/openobject-addons/lp1135873_7.0 into lp:openobject-addons/7.0

[Holger Brunn (Therp)]

[FIX] pull linkedin-api from the protocol we're on

[Martin Trigaux (OpenERP) (mat-openerp)]

We have already merged a fix for this issue at revision 8870 (always using https) and I will then reject this patch but thanks for your work.

Regards

Unmerged revisions

8780. By Holger Brunn (Therp) on 2013-02-28

[FIX] pull linkedin-api from the protocol we're on

=== modified file 'web_linkedin/static/src/js/linkedin.js'
--- web_linkedin/static/src/js/linkedin.js	2012-11-15 15:09:45 +0000
+++ web_linkedin/static/src/js/linkedin.js	2013-02-28 15:25:27 +0000
@@ -19,7 +19,7 @@
                     return self.linkedin_def.promise();
                 var tag = document.createElement('script');
                 tag.type = 'text/javascript';
-                tag.src = "http://platform.linkedin.com/in.js";
+                tag.src = document.location.protocol + "//platform.linkedin.com/in.js";
                 tag.innerHTML = 'api_key : ' + self.api_key + '\nauthorize : true\nscope: r_network r_contactinfo';
                 document.getElementsByTagName('head')[0].appendChild(tag);
                 self.linkedin_added = true;