diff --git a/drupal-org-core.make b/drupal-org-core.make index d5b8b8ef7a20264610db8551e03e2671223580b9..9b40d658464d52a153d5198ad9caf2803b982bf5 100644 --- a/drupal-org-core.make +++ b/drupal-org-core.make @@ -1,9 +1,8 @@ api = 2 core = 7.x -projects[drupal][version] = 7.21 +projects[drupal][version] = 7.22 ; Patches for Core -projects[drupal][patch][] = "http://drupal.org/files/drupal-provide_exclusive_property_install_profiles-1727430-35-d7.patch" projects[drupal][patch][] = "http://drupal.org/files/issues/install-redirect-on-empty-database-728702-36.patch" projects[drupal][patch][] = "http://drupal.org/files/drupal-1470656-14.patch" projects[drupal][patch][] = "http://drupal.org/files/drupal-865536-204.patch" diff --git a/drupal-org.make b/drupal-org.make index bd3de9c69b69021304bd668e261aa6dbdbe52041..186dd4ba808fda663ea43fa85603abf13b716f82 100755 --- a/drupal-org.make +++ b/drupal-org.make @@ -3,9 +3,8 @@ core = 7.x api = 2 ; Basic contributed modules. -projects[ctools][version] = 1.2 +projects[ctools][version] = 1.3 projects[ctools][subdir] = "contrib" -projects[ctools][patch][] = "http://drupal.org/files/autosubmit_enhanced_textfield-1694988-4.patch" projects[entity][version] = 1.0 projects[entity][subdir] = "contrib" projects[entityreference][version] = 1.0 @@ -66,12 +65,13 @@ projects[commerce_hosted_pci][version] = 1.0-rc1 projects[commerce_hosted_pci][subdir] = "contrib" projects[commerce_payleap][version] = 1.0 projects[commerce_payleap][subdir] = "contrib" -projects[commerce_moneybookers][version] = 1.1 +projects[commerce_moneybookers][version] = 1.2 projects[commerce_moneybookers][subdir] = "contrib" projects[commerce_paypal][subdir] = "contrib" projects[commerce_paypal][version] = 2.0-beta1 projects[commerce_backoffice][subdir] = "contrib" projects[commerce_backoffice][version] = 1.2 +projects[commerce_backoffice][patch][] = "http://drupal.org/files/commerce_backoffice_product-add-product-variations-view-1954150-4.patch" projects[commerce_message][subdir] = "contrib" projects[commerce_message][version] = 1.0-beta1 projects[commerce_search_api][subdir] = "contrib" @@ -103,9 +103,6 @@ projects[connector][version] = 1.0-beta2 projects[connector][subdir] = "contrib" projects[oauthconnector][version] = 1.x-dev projects[oauthconnector][subdir] = "contrib" -projects[oauthconnector][patch][] = "http://drupal.org/files/oathuconnector-notice-no-csid.patch" -projects[oauthconnector][patch][] = "http://drupal.org/files/oauthconnector-fix-ctools-exportables-1712262-2.patch" -projects[oauthconnector][patch][] = "http://drupal.org/files/1764028-oauthconnector-fix-css-class.patch" projects[inline_entity_form][version] = 1.1 projects[inline_entity_form][subdir] = "contrib" projects[field_extractor][version] = 1.3 @@ -155,7 +152,7 @@ projects[search_api_db][subdir] = "contrib" projects[search_api_db][patch][] = "http://drupal.org/files/1649042-27-search_api_db.patch" projects[search_api_ranges][version] = 1.4 projects[search_api_ranges][subdir] = "contrib" -projects[facetapi][version] = 1.2 +projects[facetapi][version] = 1.3 projects[facetapi][subdir] = "contrib" projects[facetapi][patch][] = "http://drupal.org/files/1616518-7-show-active-term.patch" projects[search_api_sorts][version] = 1.4 diff --git a/modules/commerce_kickstart/commerce_kickstart_social/commerce_kickstart_social.oauthconnector.inc b/modules/commerce_kickstart/commerce_kickstart_social/commerce_kickstart_social.oauthconnector.inc index 05c92bfad2b7ed0043d1b5d29091bf21c080277b..b5685cb4eeba674209ce236e57e79f0e3afdb306 100644 --- a/modules/commerce_kickstart/commerce_kickstart_social/commerce_kickstart_social.oauthconnector.inc +++ b/modules/commerce_kickstart/commerce_kickstart_social/commerce_kickstart_social.oauthconnector.inc @@ -128,21 +128,21 @@ function commerce_kickstart_social_default_oauthconnector_provider() { $provider->mapping = array( 'fields' => array( 'uid' => array( - 'resource' => 'https://api.twitter.com/1/account/verify_credentials.json', + 'resource' => 'https://api.twitter.com/1.1/account/verify_credentials.json', 'method post' => 0, 'field' => 'id', 'querypath' => FALSE, 'sync_with_field' => '', ), 'name' => array( - 'resource' => 'https://api.twitter.com/1/account/verify_credentials.json', + 'resource' => 'https://api.twitter.com/1.1/account/verify_credentials.json', 'method post' => 0, 'field' => 'name', 'querypath' => FALSE, 'sync_with_field' => 'name', ), 'avatar' => array( - 'resource' => 'https://api.twitter.com/1/account/verify_credentials.json', + 'resource' => 'https://api.twitter.com/1.1/account/verify_credentials.json', 'method post' => 0, 'field' => 'profile_image_url', 'querypath' => FALSE,