Merge branch 'release/0.3.7'

Marko-M · Nov 18, 2015 · 24d80ce · 24d80ce
2 parents 5bdc0a6 + 2a46dc9
commit 24d80ce
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 5 deletions.
diff --git a/app/code/community/Inchoo/SocialConnect/Helper/Facebook.php b/app/code/community/Inchoo/SocialConnect/Helper/Facebook.php
@@ -125,6 +125,7 @@ public function getCustomersByFacebookId($facebookId)
         $customer = Mage::getModel('customer/customer');
 
         $collection = $customer->getCollection()
+            ->addAttributeToSelect('inchoo_socialconnect_ftoken')
             ->addAttributeToFilter('inchoo_socialconnect_fid', $facebookId)
             ->setPageSize(1);
 

diff --git a/app/code/community/Inchoo/SocialConnect/Helper/Google.php b/app/code/community/Inchoo/SocialConnect/Helper/Google.php
@@ -115,6 +115,7 @@ public function getCustomersByGoogleId($googleId)
         $customer = Mage::getModel('customer/customer');
 
         $collection = $customer->getCollection()
+            ->addAttributeToSelect('inchoo_socialconnect_gtoken')
             ->addAttributeToFilter('inchoo_socialconnect_gid', $googleId)
             ->setPageSize(1);
 

diff --git a/app/code/community/Inchoo/SocialConnect/Helper/Linkedin.php b/app/code/community/Inchoo/SocialConnect/Helper/Linkedin.php
@@ -110,6 +110,7 @@ public function getCustomersByLinkedinId($linkedinId)
         $customer = Mage::getModel('customer/customer');
 
         $collection = $customer->getCollection()
+            ->addAttributeToSelect('inchoo_socialconnect_ltoken')
             ->addAttributeToFilter('inchoo_socialconnect_lid', $linkedinId)
             ->setPageSize(1);
 

diff --git a/app/code/community/Inchoo/SocialConnect/Helper/Twitter.php b/app/code/community/Inchoo/SocialConnect/Helper/Twitter.php
@@ -117,6 +117,7 @@ public function getCustomersByTwitterId($twitterId)
         $customer = Mage::getModel('customer/customer');
 
         $collection = $customer->getCollection()
+            ->addAttributeToSelect('inchoo_socialconnect_ttoken')
             ->addAttributeToFilter('inchoo_socialconnect_tid', $twitterId)
             ->setPageSize(1);
 

diff --git a/app/code/community/Inchoo/SocialConnect/Model/Facebook/Info.php b/app/code/community/Inchoo/SocialConnect/Model/Facebook/Info.php
@@ -104,7 +104,7 @@ protected function _load()
             $response = $this->client->api(
                 '/me',
                 'GET',
-                $this->params
+                array('fields' => implode(',', $this->params))
             );
 
             foreach ($response as $key => $value) {

diff --git a/app/code/community/Inchoo/SocialConnect/controllers/TwitterController.php b/app/code/community/Inchoo/SocialConnect/controllers/TwitterController.php
@@ -19,8 +19,6 @@ public function requestAction()
             Mage::getSingleton('core/session')->addError($e->getMessage());
             Mage::logException($e);
 
-            $this->_sessionCleanup();
-
             if(!empty($referer)) {
                 $this->_redirectUrl($referer);
             } else {
@@ -148,4 +146,4 @@ protected function _connectCallback() {
         return $this;
     }
 
-}
+}
diff --git a/app/code/community/Inchoo/SocialConnect/etc/config.xml b/app/code/community/Inchoo/SocialConnect/etc/config.xml
@@ -37,7 +37,7 @@
 <config>
     <modules>
         <Inchoo_SocialConnect>
-            <version>0.3.6</version>
+            <version>0.3.7</version>
         </Inchoo_SocialConnect>
     </modules>
     <default>

diff --git a/app/design/frontend/base/default/template/inchoo/socialconnect/customer/form/register.phtml b/app/design/frontend/base/default/template/inchoo/socialconnect/customer/form/register.phtml
@@ -43,6 +43,7 @@
         <div class="fieldset">
             <input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
             <input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
+            <input type="hidden" name="form_key" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
             <h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
             <ul class="form-list">
                 <li class="fields">

diff --git a/modman b/modman
@@ -5,8 +5,10 @@ app/etc/modules/Inchoo_SocialConnect.xml                          app/etc/module
 skin/frontend/base/default/inchoo_socialconnect/                  skin/frontend/base/default/inchoo_socialconnect/
 app/locale/da_DK/Inchoo_SocialConnect.csv                         app/locale/da_DK/Inchoo_SocialConnect.csv
 app/locale/en_US/Inchoo_SocialConnect.csv                         app/locale/en_US/Inchoo_SocialConnect.csv
+app/locale/es_ES/Inchoo_SocialConnect.csv                         app/locale/es_ES/Inchoo_SocialConnect.csv
 app/locale/sl_SI/Inchoo_SocialConnect.csv                         app/locale/sl_SI/Inchoo_SocialConnect.csv
 app/locale/de_DE/Inchoo_SocialConnect.csv                         app/locale/de_DE/Inchoo_SocialConnect.csv
 app/locale/fr_FR/Inchoo_SocialConnect.csv                         app/locale/fr_FR/Inchoo_SocialConnect.csv
 app/locale/es_MX/Inchoo_SocialConnect.csv                         app/locale/es_MX/Inchoo_SocialConnect.csv
 app/locale/it_IT/Inchoo_SocialConnect.csv                         app/locale/it_IT/Inchoo_SocialConnect.csv
+app/locale/tr_TR/Inchoo_SocialConnect.csv                         app/locale/tr_TR/Inchoo_SocialConnect.csv