Browse Source

Removed trailing slash in created URLs.

tags/2.0.0-beta
Qiang Xue 12 years ago
parent
commit
b6fffeb0e4
  1. 8
      tests/unit/framework/web/UrlManagerTest.php
  2. 2
      yii/web/UrlManager.php

8
tests/unit/framework/web/UrlManagerTest.php

@ -14,9 +14,9 @@ class UrlManagerTest extends \yiiunit\TestCase
'cache' => null,
));
$url = $manager->createUrl('post/view');
$this->assertEquals('/?r=post/view', $url);
$this->assertEquals('?r=post/view', $url);
$url = $manager->createUrl('post/view', array('id' => 1, 'title' => 'sample post'));
$this->assertEquals('/?r=post/view&id=1&title=sample+post', $url);
$this->assertEquals('?r=post/view&id=1&title=sample+post', $url);
// default setting with '/test/' as base url
$manager = new UrlManager(array(
@ -24,7 +24,7 @@ class UrlManagerTest extends \yiiunit\TestCase
'cache' => null,
));
$url = $manager->createUrl('post/view', array('id' => 1, 'title' => 'sample post'));
$this->assertEquals('/test/?r=post/view&id=1&title=sample+post', $url);
$this->assertEquals('/test?r=post/view&id=1&title=sample+post', $url);
// pretty URL without rules
$manager = new UrlManager(array(
@ -112,7 +112,7 @@ class UrlManagerTest extends \yiiunit\TestCase
'cache' => null,
));
$url = $manager->createAbsoluteUrl('post/view', array('id' => 1, 'title' => 'sample post'));
$this->assertEquals('http://www.example.com/?r=post/view&id=1&title=sample+post', $url);
$this->assertEquals('http://www.example.com?r=post/view&id=1&title=sample+post', $url);
}
public function testParseRequest()

2
yii/web/UrlManager.php

@ -203,7 +203,7 @@ class UrlManager extends Component
}
return "$baseUrl/{$route}{$anchor}";
} else {
$url = "$baseUrl/?{$this->routeVar}=$route";
$url = "$baseUrl?{$this->routeVar}=$route";
if (!empty($params)) {
$url .= '&' . http_build_query($params);
}

Loading…
Cancel
Save