ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverting di refactoring.

Browse Source
This commit is contained in:
Taylor Otwell
2011-10-29 22:31:50 -05:00
parent f5680e4537
commit ef9e4dfd61
12 changed files with 101 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
laravel/paginator.php
View File

@@ -105,7 +105,7 @@ class Paginator {
*/
public static function page($total, $per_page)
{
$page = IoC::container()->core('input')->get('page', 1);
$page = Input::get('page', 1);
// The page will be validated and adjusted if it is less than one or greater
// than the last page. For example, if the current page is not an integer or
@@ -250,11 +250,11 @@ class Paginator {
// We will assume the page links should use HTTPS if the current request
// is also using HTTPS. Since pagination links automatically point to
// the current URI, this makes pretty good sense.
$request = IoC::container()->core('request');
list($uri, $secure) = array(Request::uri()->get(), Request::secure());
$appendage = $this->appendage($element, $page);
return HTML::link($request->uri().$appendage, $text, array('class' => $class), $requst->secure());
return HTML::link($uri.$appendage, $text, array('class' => $class), $secure);
}
}