Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix admin grid filter, ref #1430 #2602

Merged
merged 2 commits into from
Sep 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ public function getBundleOptions(Mage_Catalog_Model_Product_Configuration_Item_I
$optionsQuoteItemOption = $item->getOptionByCode('bundle_option_ids');
$bundleOptionsIds = $optionsQuoteItemOption ? unserialize($optionsQuoteItemOption->getValue(), ['allowed_classes' => false]) : [];
if ($bundleOptionsIds) {
/** @var Mage_Bundle_Model_Resource_Option_Collection $bundleOptionsIds */
$optionsCollection = $typeInstance->getOptionsByIds($bundleOptionsIds, $product);

// get and add bundle selections collection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function validateUserValue($values)
/**
* Prepare option value for cart
*
* @return array|int|string|null Prepared option value
* @return int|string|null Prepared option value
*/
public function prepareForCart()
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Paypal/Model/Payflowlink.php
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ protected function _checkTransaction($transaction, $amount)
* Check response from Payflow gateway.
*
* @deprecated since 1.6.2.0
* @return null in case of validation passed
* @return null
*/
protected function _getDocumentFromResponse()
{
Expand Down
3 changes: 2 additions & 1 deletion lib/Varien/Db/Adapter/Pdo/Mysql.php
Original file line number Diff line number Diff line change
Expand Up @@ -3008,7 +3008,8 @@ public function prepareSqlCondition($fieldName, $condition)
*/
protected function _prepareQuotedSqlCondition($text, $value, $fieldName)
{
$sql = $this->quoteInto($text, str_replace("\0", '', $value));
$value = is_string($value) ? str_replace("\0", '', $value) : $value;
$sql = $this->quoteInto($text, $value);
return str_replace('{{fieldName}}', $fieldName, $sql);
}

Expand Down