Skip to content

Commit 8513b58

Browse files
carlosescricarlosescri
committed
Merge branch 'release/v1.8.29'
2 parents 7b10ceb + 4ca6202 commit 8513b58

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+105
-91
lines changed

‎app/code/community/Doofinder/Feed/Block/Adminhtml/Log/View.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
class Doofinder_Feed_Block_Adminhtml_Log_View extends Mage_Adminhtml_Block_Widget_Grid

‎app/code/community/Doofinder/Feed/Block/Adminhtml/Map/Additional.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
class Doofinder_Feed_Block_Adminhtml_Map_Additional extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Banner.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
class Doofinder_Feed_Block_Banner extends Mage_Core_Block_Template

‎app/code/community/Doofinder/Feed/Block/Integration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
class Doofinder_Feed_Block_Integration extends Mage_Core_Block_Abstract

‎app/code/community/Doofinder/Feed/Block/Settings/Buttons/Generate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Buttons_Generate extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Buttons/ViewLog.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Buttons_ViewLog extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Locks.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Locks extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/AtomicUpdates.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_AtomicUpdates extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/Crondescription.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_CronDescription extends Doofinder_Feed_Block_Settings_Panel_Description

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/Datetime.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_Datetime extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/Description.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_Description extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/DynamicFeedUrl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_DynamicFeedUrl extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/File.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_File extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/Layerdescription.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_LayerDescription extends Doofinder_Feed_Block_Settings_Panel_Description

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/Message.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_Message extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Helper/Banner.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
/**
77
* @category Helpers
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
/**
1313
* Data helper for Doofinder Feed
1414
*
15-
* @version 1.8.28
15+
* @version 1.8.29
1616
* @package Doofinder_Feed
1717
*/
1818
class Doofinder_Feed_Helper_Banner extends Mage_Core_Helper_Abstract

‎app/code/community/Doofinder/Feed/Helper/Data.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
/**
77
* @category Helpers
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
/**
1313
* Data helper for Doofinder Feed
1414
*
15-
* @version 1.8.28
15+
* @version 1.8.29
1616
* @package Doofinder_Feed
1717
*/
1818
class Doofinder_Feed_Helper_Data extends Mage_Core_Helper_Abstract

‎app/code/community/Doofinder/Feed/Helper/Log.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
/**
77
* @category Helpers
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
/**
1313
* Log helper for Doofinder Feed
1414
*
15-
* @version 1.8.28
15+
* @version 1.8.29
1616
* @package Doofinder_Feed
1717
*/
1818
class Doofinder_Feed_Helper_Log extends Mage_Core_Helper_Abstract

‎app/code/community/Doofinder/Feed/Helper/Tax.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category Helpers
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
class Doofinder_Feed_Helper_Tax extends Mage_Tax_Helper_Data

‎app/code/community/Doofinder/Feed/Model/Adminhtml/System/Config/Backend/Cron.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category Models
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
class Doofinder_Feed_Model_Adminhtml_System_Config_Backend_Cron extends Mage_Core_Model_Config_Data

‎app/code/community/Doofinder/Feed/Model/Config.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
/**
77
* @category Models
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
/**
1313
* Config model for Doofinder Feed
1414
*
15-
* @version 1.8.28
15+
* @version 1.8.29
1616
* @package Doofinder_Feed
1717
*/
1818
class Doofinder_Feed_Model_Config extends Mage_Core_Model_Config_Data

‎app/code/community/Doofinder/Feed/Model/Cron.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category Models
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
class Doofinder_Feed_Model_Cron extends Mage_Core_Model_Abstract

‎app/code/community/Doofinder/Feed/Model/Generator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
/**
77
* @category Models
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
/**
1313
* Generator model for Doofinder Feed
1414
*
15-
* @version 1.8.28
15+
* @version 1.8.29
1616
* @package Doofinder_Feed
1717
*/
1818
if (!defined('DS'))

‎app/code/community/Doofinder/Feed/Model/Log.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category Models
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
class Doofinder_Feed_Model_Log extends Mage_Core_Model_Abstract

‎app/code/community/Doofinder/Feed/Model/Map/Product/Abstract.php

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
/**
77
* @category Models
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
/**
1313
* Abstract Product Map Model for Doofinder Feed
1414
*
15-
* @version 1.8.28
15+
* @version 1.8.29
1616
* @package Doofinder_Feed
1717
*/
1818
class Doofinder_Feed_Model_Map_Product_Abstract extends Varien_Object
@@ -26,6 +26,15 @@ class Doofinder_Feed_Model_Map_Product_Abstract extends Varien_Object
2626
*/
2727
protected $_log;
2828

29+
// Default attributes which shouldn't be escaped from slash
30+
private $defaultNonEscapedSlash = [
31+
'name',
32+
'description',
33+
'short_description',
34+
'sku',
35+
'id',
36+
];
37+
2938
/**
3039
* Initialize log
3140
*/
@@ -144,7 +153,7 @@ protected function mapAttribute($params = array())
144153

145154
$fieldData = $this->getAttributeValue($product, $attribute);
146155

147-
return $this->cleanField($fieldData);
156+
return $this->cleanField($fieldData, $attribute->getAttributeCode());
148157
}
149158

150159
protected function mapAttributeDescription($params = array())
@@ -160,7 +169,7 @@ protected function mapAttributeDescription($params = array())
160169

161170
$description = $this->getAttributeValue($product, $attribute);
162171

163-
return $this->cleanField($description);
172+
return $this->cleanField($description, $attribute->getAttributeCode());
164173
}
165174

166175
protected function mapDirectiveId()
@@ -425,15 +434,15 @@ public function loadAssocIds($product, $storeId)
425434
return $assocIds;
426435
}
427436

428-
protected function cleanField($field)
437+
protected function cleanField($field, $code = '')
429438
{
430439
if (is_array($field)) {
431440
foreach ($field as &$value) {
432-
$value = $this->cleanFieldValue($value);
441+
$value = $this->cleanFieldValue($value, $code);
433442
unset($value);
434443
}
435444
} else {
436-
$field = $this->cleanFieldValue($field);
445+
$field = $this->cleanFieldValue($field, $code);
437446
}
438447

439448
return $field;
@@ -443,22 +452,23 @@ protected function cleanField($field)
443452
* Cleans invalid utf8 characters, strips tags and trims
444453
*
445454
* @param string|array $field
455+
* @param string $code
446456
*/
447-
protected function cleanFieldValue($field)
457+
protected function cleanFieldValue($field, $code = '')
448458
{
449459
// Do nothing if field is empty
450460
if (!$field) return $field;
451461

452-
$cleaned = $this->cleanFieldValueArray((array) $field);
462+
$cleaned = $this->cleanFieldValueArray((array) $field, (array) $code);
453463
return is_array($field) ? $cleaned : $cleaned[0];
454464
}
455465

456-
protected function cleanFieldValueArray($fields)
466+
protected function cleanFieldValueArray($fields, $code)
457467
{
458-
return array_map(array($this, '_cleanFieldValue'), $fields);
468+
return array_map(array($this, '_cleanFieldValue'), $fields, $code);
459469
}
460470

461-
protected function _cleanFieldValue($field)
471+
protected function _cleanFieldValue($field, $code)
462472
{
463473
// http://stackoverflow.com/questions/4224141/php-removing-invalid-utf-8-characters-in-xml-using-filter
464474
$validUtf = '/([\x09\x0A\x0D\x20-\x7E]|[\xC2-\xDF][\x80-\xBF]|' .
@@ -470,8 +480,12 @@ protected function _cleanFieldValue($field)
470480
$field = strip_tags($field);
471481
$field = preg_replace('/[ ]{2,}/', ' ', $field);
472482
$field = trim($field);
473-
// Use a double slash to prevent the doofinder from treating it as a separator
474-
$field = str_replace('/', '//', $field);
483+
484+
if (!in_array($code, $this->defaultNonEscapedSlash)) {
485+
// Use a double slash to prevent the doofinder from treating it as a separator
486+
$field = str_replace('/', '//', $field);
487+
}
488+
475489
// @codingStandardsIgnoreStart
476490
$field = html_entity_decode($field, null, 'UTF-8');
477491
// @codingStandardsIgnoreEnd

‎app/code/community/Doofinder/Feed/Model/Map/Product/Associated.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
/**
77
* @category Models
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
/**
1313
* Associated Product Map Model for Doofinder Feed
1414
*
15-
* @version 1.8.28
15+
* @version 1.8.29
1616
* @package Doofinder_Feed
1717
*/
1818
class Doofinder_Feed_Model_Map_Product_Associated

‎app/code/community/Doofinder/Feed/Model/Map/Product/Bundle.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
/**
77
* @category Models
88
* @package Doofinder_Feed
9-
* @version 1.8.28
9+
* @version 1.8.29
1010
*/
1111

1212
/**
1313
* Bundle Product Map Model for Doofinder Feed
1414
*
15-
* @version 1.8.28
15+
* @version 1.8.29
1616
* @package Doofinder_Feed
1717
*/
1818
class Doofinder_Feed_Model_Map_Product_Bundle

0 commit comments

Comments
 (0)