<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -161,7 +161,7 @@ class Joeh_Template_Helper_Form extends Joeh_Template_Helper {
 		return $html;
     }
 
-    public function select($object, $property, $textProperty, $from, array $htmlOptions = array()) {
+    public function select($object, $property, $from, array $htmlOptions = array()) {
         $htmlOptions['id'] = sprintf('%s_%s', $object, $property);
         $name = sprintf('%s[%s]', $object, $property);
         $value = null;
@@ -170,7 +170,20 @@ class Joeh_Template_Helper_Form extends Joeh_Template_Helper {
             $value = $this-&gt;{$object}-&gt;{$property};
         }
 
-        return $this-&gt;selectTag($name, $this-&gt;optionsForSelect($from, $textProperty, $property, $value), $htmlOptions);
+        $textProperty = &quot;name&quot;;
+        $valueProperty = &quot;id&quot;;
+
+        if(!empty($htmlOptions[&quot;textProperty&quot;])) {
+            $textProperty = $htmlOptions[&quot;textProperty&quot;];
+            unset($htmlOptions[&quot;textProperty&quot;]);
+        }
+
+        if(!empty($htmlOptions[&quot;valueProperty&quot;])) {
+            $valueProperty = $htmlOptions[&quot;valueProperty&quot;];
+            unset($htmlOptions[&quot;valueProperty&quot;]);
+        }
+
+        return $this-&gt;selectTag($name, $this-&gt;optionsForSelect($from, $textProperty, $valueProperty, $value), $htmlOptions);
     }
 
     public function selectTag($name, $options = '', array $htmlOptions = array()) {</diff>
      <filename>lib/Joeh/Template/Helper/Form.php</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>fab924f8bee5fb2197a64315599ca9717b057691</id>
    </parent>
  </parents>
  <author>
    <name>rafaelss</name>
    <email>rafael.ssouza@gmail.com</email>
  </author>
  <url>http://github.com/rafaelss/joeh-template/commit/ce0af69e3cafc9564b472ce534a94047398817b9</url>
  <id>ce0af69e3cafc9564b472ce534a94047398817b9</id>
  <committed-date>2009-02-04T03:39:49-08:00</committed-date>
  <authored-date>2009-02-04T03:39:49-08:00</authored-date>
  <message>added two options for Form::select helper, textProperty and valueProperty</message>
  <tree>ab19b51e0f2f59248b0580d14266aef16c29f50f</tree>
  <committer>
    <name>rafaelss</name>
    <email>rafael.ssouza@gmail.com</email>
  </committer>
</commit>
