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

merged skunkworks into develop.

Browse Source
This commit is contained in:
Taylor Otwell
2012-01-16 13:59:24 -06:00
parent 610d8827c4
commit b5442c67fc
117 changed files with 7268 additions and 3999 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
laravel/paginator.php
View File

@@ -173,8 +173,8 @@ class Paginator {
//
// If there are not enough pages to make the creation of a slider possible
// based on the adjacent pages, we will simply display all of the pages.
// Otherwise, we will create a "truncating" slider which displays a nice
// window of pages based on the current page.
// Otherwise, we will create a "truncating" slider which displays a
// nice window of pages based on the current page.
if ($this->last < 7 + ($adjacent * 2))
{
$links = $this->range(1, $this->last);
@@ -288,7 +288,10 @@ class Paginator {
{
$class = "{$element}_page";
if (is_null($text)) $text = Lang::line("pagination.{$element}")->get($this->language);
if (is_null($text))
{
$text = Lang::line("pagination.{$element}")->get($this->language);
}
// Each consumer of this method provides a "disabled" Closure which can
// be used to determine if the element should be a span element or an
@@ -383,12 +386,14 @@ class Paginator {
*/
protected function appendage($appends)
{
if ( ! is_null($this->appendage))
if ( ! is_null($this->appendage)) return $this->appendage;
if (count($appends) <= 0)
{
return $this->appendage;
return $this->appendage = '';
}
return $this->appendage = (count($appends) > 0) ? '&'.http_build_query($appends) : '';
return $this->appendage = '&'.http_build_query($appends);
}
/**