Merge pull request #3 from magento-hackathon/fixes

Fixes

Author: lfolco

src/app/code/community/Hackathon/PromoCodeMessages/Model/Validator.php

@@ -238,7 +238,7 @@ protected function _validateConditions($rule)
             $msgs = array_merge($msgs, $this->_processCondition($condition));
         }
         if (count($msgs) > 0) {
-            $errorMsgs = $this->_multi_implode('', $msgs);
+            $errorMsgs = $this->_multiImplode('', $msgs);
             Mage::throwException($this->_formatMessage($errorMsgs));
         }
     }
@@ -329,8 +329,7 @@ protected function _processRule($condition = array())
                     ->setStoreFilter($storeId, false)
                     ->addFieldToFilter('tsv.option_id', array('in' => $value));
                 if ($collection->getSize() > 0) {
-                    $item = $collection->getFirstItem();
-                    $value = $item->getValue();
+                    $value = $collection->getFirstItem()->getValue();
                 }
             }
         }
@@ -359,7 +358,6 @@ protected function _processRule($condition = array())
      * Setup a heading for aggregated rule conditions.
      *
      * @param String $aggregator "any" or "all"
-     * @param bool $aggregatedOnly False if the heading is in addition to existing error messages
      * @return String containing aggregate heading
      */
     protected function _createAggregatedHeading($aggregator)
@@ -408,13 +406,13 @@ protected function _formatMessage($message, $params = '', $internalMessage = nul
      * @param $array
      * @return string
      */
-    protected function _multi_implode($glue, $array)
+    protected function _multiImplode($glue, $array)
     {
         $ret = '';
 
         foreach ($array as $item) {
             if (is_array($item)) {
-                $ret .= $this->_multi_implode($glue, $item) . $glue;
+                $ret .= $this->_multiImplode($glue, $item) . $glue;
             }
             else {
                 $ret .= $item . $glue;