Skip to content

Commit

Permalink
zfc-datagrid stable
Browse files Browse the repository at this point in the history
  • Loading branch information
kokspflanze committed Oct 21, 2015
1 parent b0dbec3 commit 8bc1b5a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
"kokspflanze/p-server-panel": "dev-master",
"zf-commons/zfc-twig": "dev-master",
"kokspflanze/zfc-bbcode": "~1.0",
"thadafinser/zfc-datagrid": "dev-master",
"san/san-captcha": "dev-master"
},
"require-dev": {
Expand Down
12 changes: 6 additions & 6 deletions src/PServerCMS/View/Helper/Active.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@ class Active extends InvokerBase
*
* @return bool
*/
public function __invoke( $routeKey, $params = array() )
public function __invoke($routeKey, $params = [])
{
$router = $this->getRouterService();
$router = $this->getRouterService();
$request = $this->getRequestService();

$routeMatch = $router->match( $request );
$routeMatch = $router->match($request);

if (is_null( $routeMatch )) {
if (is_null($routeMatch)) {
return false;
}

if ($routeKey != $routeMatch->getMatchedRouteName()) {
return false;
}

if (is_array( $params ) || $params instanceof \Traversable) {
if (is_array($params) || $params instanceof \Traversable) {
foreach ($params as $key => $param) {
if ($router->match( $request )->getParam( $key ) != $param) {
if ($router->match($request)->getParam($key) != $param) {
return false;
}
}
Expand Down

0 comments on commit 8bc1b5a

Please sign in to comment.