Merge branch '4.2'

taylorotwell · taylorotwell · commit c2da4c00110c · 2014-05-30T11:23:41.000-05:00
diff --git a/src/Illuminate/Html/FormBuilder.php b/src/Illuminate/Html/FormBuilder.php
@@ -466,15 +466,16 @@ public function selectYear()
 	 * @param  string  $name
 	 * @param  string  $selected
 	 * @param  array   $options
+	 * @param  string  $format
 	 * @return string
 	 */
-	public function selectMonth($name, $selected = null, $options = array())
+	public function selectMonth($name, $selected = null, $options = array(), $format = '%B')
 	{
 		$months = array();
 
 		foreach (range(1, 12) as $month)
 		{
-			$months[$month] = strftime('%B', mktime(0, 0, 0, $month, 1));
+			$months[$month] = strftime($format, mktime(0, 0, 0, $month, 1));
 		}
 
 		return $this->select($name, $months, $selected, $options);

Original file line number	Diff line number	Diff line change
`@@ -466,15 +466,16 @@ public function selectYear()`
`466`	`466`	`* @param string $name`
`467`	`467`	`* @param string $selected`
`468`	`468`	`* @param array $options`
	`469`	`+ * @param string $format`
`469`	`470`	`* @return string`
`470`	`471`	`*/`
`471`		`- public function selectMonth($name, $selected = null, $options = array())`
	`472`	`+ public function selectMonth($name, $selected = null, $options = array(), $format = '%B')`
`472`	`473`	`{`
`473`	`474`	`$months = array();`
`474`	`475`
`475`	`476`	`foreach (range(1, 12) as $month)`
`476`	`477`	`{`
`477`		`- $months[$month] = strftime('%B', mktime(0, 0, 0, $month, 1));`
	`478`	`+ $months[$month] = strftime($format, mktime(0, 0, 0, $month, 1));`
`478`	`479`	`}`
`479`	`480`
`480`	`481`	`return $this->select($name, $months, $selected, $options);`