From 9d14c9a6edf79736efa1689e5e2a0d6e459fc946 Mon Sep 17 00:00:00 2001 From: Takuro Hishikawa Date: Thu, 30 Apr 2015 11:59:23 +0900 Subject: [PATCH] Fix to use pagination arguments --- web/concrete/src/Search/Pagination/Pagination.php | 2 +- web/concrete/src/Search/Pagination/View/ViewRenderer.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/concrete/src/Search/Pagination/Pagination.php b/web/concrete/src/Search/Pagination/Pagination.php index 0dcfa6c7b29..a766777337f 100644 --- a/web/concrete/src/Search/Pagination/Pagination.php +++ b/web/concrete/src/Search/Pagination/Pagination.php @@ -49,7 +49,7 @@ public function getItemListObject() */ public function renderDefaultView($arguments = array()) { - return $this->renderView('application', $arguments = array()); + return $this->renderView('application', $arguments); } public function renderView($driver = 'application', $arguments = array()) diff --git a/web/concrete/src/Search/Pagination/View/ViewRenderer.php b/web/concrete/src/Search/Pagination/View/ViewRenderer.php index 204916adf26..53fb82b1ee0 100644 --- a/web/concrete/src/Search/Pagination/View/ViewRenderer.php +++ b/web/concrete/src/Search/Pagination/View/ViewRenderer.php @@ -36,7 +36,7 @@ public function render($args = array()) return $this->view->render( $this->pagination, $this->routeCollectionFunction, - $this->view->getArguments() + array_merge($this->view->getArguments(), $args) ); } } \ No newline at end of file