Skip to content

Commit 893e177

Browse files
committed
Fixing isset() checks in Router to test for empty values instead.
Updating prefix use in paginator helper test.
1 parent 17782f7 commit 893e177

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

cake/libs/router.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,10 @@ function Router() {
177177
**/
178178
function __setPrefixes() {
179179
$routing = Configure::read('Routing');
180-
if (isset($routing['admin'])) {
180+
if (!empty($routing['admin'])) {
181181
$this->__prefixes[] = $routing['admin'];
182182
}
183-
if (isset($routing['prefixes'])) {
183+
if (!empty($routing['prefixes'])) {
184184
$this->__prefixes = array_merge($this->__prefixes, (array)$routing['prefixes']);
185185
}
186186
}

cake/tests/cases/libs/view/helpers/paginator.test.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,11 @@ function testUrlGeneration() {
449449
* @return void
450450
*/
451451
function testUrlGenerationWithPrefixes() {
452-
$memberPrefixes = array('prefix' => 'members', 'members' => true);
453-
Router::connect('/members/:controller/:action/*', $memberPrefixes);
452+
$_back = Configure::read('Routing');
453+
454+
Configure::write('Routing.prefixes', array('members'));
455+
Router::reload();
456+
454457
Router::parse('/');
455458

456459
Router::setRequestInfo( array(
@@ -500,6 +503,8 @@ function testUrlGenerationWithPrefixes() {
500503
$result = $this->Paginator->url($options);
501504
$expected = '/posts/index/page:2/sort:Article.name/direction:desc';
502505
$this->assertEqual($result, $expected);
506+
507+
Configure::write('Routing', $_back);
503508
}
504509

505510
/**

0 commit comments

Comments
 (0)