From b92ff1de89d92b789042eb717cea8ec31afc4e83 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Mon, 27 Aug 2012 12:04:04 -0400
Subject: [PATCH] CC-4290: Playlists -> Dynamic Smart Block-> "in the range"
 criteria seems to be not working

-fixed
---
 airtime_mvc/application/models/Block.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php
index 49e07d9b6..41cc438ec 100644
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@@ -1173,12 +1173,19 @@ EOT;
                             $spCriteria = 'date('.$spCriteria.')';
                             $spCriteriaValue = substr($spCriteriaValue, 0, 10);
                         }
+                    
+                        if (isset($criteria['extra'])) {
+                            $spCriteriaExtra = Application_Common_DateHelper::ConvertToUtcDateTimeString($criteria['extra']);
+                            if (strlen($criteria['extra']) <= 10) {
+                                $spCriteriaExtra = substr($spCriteriaExtra, 0, 10);
+                            }
+                        }
                     } else if ($spCriteria == "bit_rate" || $spCriteria == 'sample_rate') {
                         // multiply 1000 because we store only number value
                         // e.g 192kps is stored as 192000
                         $spCriteriaValue = $criteria['value']*1000;
                         if (isset($criteria['extra'])) {
-                            $criteria['extra'] *= 1000;
+                            $spCriteriaExtra = $criteria['extra']*1000;
                         }
                     } else {
                         /* Propel does not escape special characters properly when using LIKE/ILIKE
@@ -1201,7 +1208,7 @@ EOT;
                     } else if ($spCriteriaModifier == "contains" || $spCriteriaModifier == "does not contain") {
                         $spCriteriaValue = "%$spCriteriaValue%";
                     } else if ($spCriteriaModifier == "is in the range") {
-                        $spCriteriaValue = "$spCriteria >= '$spCriteriaValue' AND $spCriteria <= '$criteria[extra]'";
+                        $spCriteriaValue = "$spCriteria >= '$spCriteriaValue' AND $spCriteria <= '$spCriteriaExtra'";
                     }
                     
                     $spCriteriaModifier = self::$modifier2CriteriaMap[$spCriteriaModifier];