Merge branch '4.2'

taylorotwell · taylorotwell · commit feed52f1f07e · 2014-05-11T12:21:10.000-05:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -23,4 +23,4 @@ Laravel follows the [PSR-0](https://github.com/php-fig/fig-standards/blob/master
 - Namespace declarations should be on the same line as `<?php`.
 - Class opening `{` should be on the same line as the class name.
 - Function and control structure opening `{` should be on a separate line.
-- Interface names are suffixed with `Interface` (`FooInterface`)
+- Interface and Trait names are suffixed with `Interface` (`FooInterface`) and `Trait` (`FooTrait`) respectively.
diff --git a/src/Illuminate/Pagination/Factory.php b/src/Illuminate/Pagination/Factory.php
@@ -126,7 +126,7 @@ public function getPaginationView(Paginator $paginator, $view = null)
 	 */
 	public function getCurrentPage()
 	{
-		$page = (int) $this->currentPage ?: $this->request->query->get($this->pageName, 1);
+		$page = (int) $this->currentPage ?: $this->request->input($this->pageName, 1);
 
 		if ($page < 1 || filter_var($page, FILTER_VALIDATE_INT) === false)
 		{

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public function getPaginationView(Paginator $paginator, $view = null)`
`126`	`126`	`*/`
`127`	`127`	`public function getCurrentPage()`
`128`	`128`	`{`
`129`		`- $page = (int) $this->currentPage ?: $this->request->query->get($this->pageName, 1);`
	`129`	`+ $page = (int) $this->currentPage ?: $this->request->input($this->pageName, 1);`
`130`	`130`
`131`	`131`	`if ($page < 1 \|\| filter_var($page, FILTER_VALIDATE_INT) === false)`
`132`	`132`	`{`