From 02b7e528b4332a27028d37e891d25423a14f9db8 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Thu, 30 Jun 2016 14:38:43 +0900
Subject: [PATCH] =?UTF-8?q?=E4=BB=B6=E6=95=B0=E3=82=92=E5=88=87=E3=82=8A?=
 =?UTF-8?q?=E6=9B=BF=E3=81=88=E3=81=A6=E3=82=82=E3=83=87=E3=83=95=E3=82=A9?=
 =?UTF-8?q?=E3=83=AB=E3=83=88=E4=BB=B6=E6=95=B0=E3=81=AE=E3=81=BE=E3=81=BE?=
 =?UTF-8?q?=E3=81=A8=E3=81=AA=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 View/Helper/DisplayNumberHelper.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/View/Helper/DisplayNumberHelper.php b/View/Helper/DisplayNumberHelper.php
index 46aaf653..fc7a3386 100644
--- a/View/Helper/DisplayNumberHelper.php
+++ b/View/Helper/DisplayNumberHelper.php
@@ -168,8 +168,9 @@ public function dropDownToggle($attributes = array()) {
 			unset($attributes['unit']);
 		}
 
-		if (! isset($attributes['currentLimit'])) {
-			$attributes['currentLimit'] = $this->_View->Paginator->param('limit');
+		$currentLimit = $this->_View->Paginator->param('limit');
+		if ($currentLimit) {
+			$attributes['currentLimit'] = $currentLimit;
 		}
 
 		if (! isset($attributes['url'])) {