Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #140 from paulboco/develop 

Change attributes in paginator to public and fix issue #141
This commit is contained in:
Taylor Otwell 2011-11-07 07:32:06 -08:00
parent 97a3f33cb4 fb25edd0b1
commit 498a83abe9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
laravel/paginator.php
View File

@ -14,28 +14,28 @@ class Paginator {
* *
* @var int * @var int
*/ */
protected $page; public $page;
/** /**
* The last page available for the result set. * The last page available for the result set.
* *
* @var int * @var int
*/ */
protected $last; public $last;
/** /**
* The total number of results. * The total number of results.
* *
* @var int * @var int
*/ */
protected $total; public $total;
/** /**
* The number of items per page. * The number of items per page.
* *
* @var int * @var int
*/ */
protected $per_page; public $per_page;
/** /**
* The values that should be appended to the end of the link query strings. * The values that should be appended to the end of the link query strings.

4
laravel/security/auth.php
View File

@ -112,7 +112,7 @@ protected static function recall($cookie)
* and their user ID will be stored in the session via the "login" method. * and their user ID will be stored in the session via the "login" method.
* *
* The user may also be "remembered", which will keep the user logged into the * The user may also be "remembered", which will keep the user logged into the
* application for one year or until they logout. The user is rememberd via * application for one year or until they logout. The user is remembered via
* an encrypted cookie. * an encrypted cookie.
* *
* @param string $username * @param string $username
@ -128,7 +128,7 @@ public static function attempt($username, $password = null, $remember = false)
if ( ! is_null($user)) if ( ! is_null($user))
{ {
static::login($user, $config, $remember); static::login($user, $remember);
return true; return true;
} }