From 044205397c39aced45fc62eed5feba447d917b96 Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Tue, 22 Jul 2014 16:22:07 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 76749: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 76731: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 76727: Merged V4.1.9 (4.1.9) to V4.1-BUG-FIX (4.1.10) 76272: MNT-11873 It is impossible to publish in Flickr channel - Use new SSL URL https://api.flickr.com/services/ git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77679 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../flickr/springsocial/api/impl/FlickrTemplate.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/publishing/flickr/springsocial/api/impl/FlickrTemplate.java b/source/java/org/alfresco/repo/publishing/flickr/springsocial/api/impl/FlickrTemplate.java index 650200cadb..27ac9158e5 100644 --- a/source/java/org/alfresco/repo/publishing/flickr/springsocial/api/impl/FlickrTemplate.java +++ b/source/java/org/alfresco/repo/publishing/flickr/springsocial/api/impl/FlickrTemplate.java @@ -44,8 +44,7 @@ import org.springframework.util.MultiValueMap; */ public class FlickrTemplate extends AbstractOAuth1ApiBinding implements Flickr, FlickrHelper { - private static final String DEFAULT_ENDPOINT = "http://api.flickr.com/services/"; -// private static final String DEFAULT_ENDPOINT = "https://secure.flickr.com/services/"; + private static final String DEFAULT_ENDPOINT = "https://api.flickr.com/services/"; private static String endpoint = DEFAULT_ENDPOINT;