Fix admin grid filter, ref OpenMage#1430 (OpenMage#2602)

Author: sreichel

app/code/core/Mage/Bundle/Helper/Catalog/Product/Configuration.php

@@ -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

app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php

@@ -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()
     {

app/code/core/Mage/Paypal/Model/Payflowlink.php

@@ -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()
     {

lib/Varien/Db/Adapter/Pdo/Mysql.php

@@ -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);
     }