File tree Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -269,6 +269,11 @@ public function match($url) {
269
269
return false ;
270
270
}
271
271
272
+ // Missing defaults is a fail.
273
+ if (array_diff_key ($ defaults , $ url ) !== array ()) {
274
+ return false ;
275
+ }
276
+
272
277
$ named = $ pass = $ diff = array ();
273
278
274
279
foreach ($ url as $ key => $ value ) {
@@ -307,7 +312,6 @@ public function match($url) {
307
312
}
308
313
}
309
314
310
-
311
315
//if a not a greedy route, no extra params are allowed.
312
316
if (!$ this ->_greedy && ( (!empty ($ pass ) || !empty ($ named )) || array_diff_key ($ diff , $ keyNames ) != array ()) ) {
313
317
return false ;
Original file line number Diff line number Diff line change @@ -1516,7 +1516,7 @@ function testUrlGenerationWithLegacyPrefixes() {
1516
1516
1517
1517
$ result = Router::url (array ('controller ' => 'images ' , 'action ' => 'add ' ));
1518
1518
$ expected = '/images/add ' ;
1519
- $ this ->assertEqual ( $ result , $ expected );
1519
+ $ this ->assertEquals ( $ expected , $ result );
1520
1520
1521
1521
$ result = Router::url (array ('controller ' => 'images ' , 'action ' => 'add ' , 'protected ' => true ));
1522
1522
$ expected = '/protected/images/add ' ;
You can’t perform that action at this time.
0 commit comments