Skip to content

Commit 7205f5e

Browse files
committed
Made it slightly neater
1 parent d40452b commit 7205f5e

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

lib/Cake/Routing/Route/CakeRoute.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -517,28 +517,28 @@ protected function _writeUrl($params) {
517517
}
518518
$out = $this->template;
519519

520-
$search = $replace = array();
520+
if(!empty($this->keys)) {
521+
522+
$search = $replace = array();
521523

522-
if(empty($this->keys)) {
523-
$keys = array();
524-
} else {
525524
$lengths = array_map('strlen', $this->keys);
526525
$flipped = array_combine($this->keys, $lengths);
527526
arsort($flipped);
528527
$keys = array_keys($flipped);
529-
}
530528

531-
foreach ($keys as $key) {
532-
$string = null;
533-
if (isset($params[$key])) {
534-
$string = $params[$key];
535-
} elseif (strpos($out, $key) != strlen($out) - strlen($key)) {
536-
$key .= '/';
529+
foreach ($keys as $key) {
530+
$string = null;
531+
if (isset($params[$key])) {
532+
$string = $params[$key];
533+
} elseif (strpos($out, $key) != strlen($out) - strlen($key)) {
534+
$key .= '/';
535+
}
536+
$search[] = ':' . $key;
537+
$replace[] = $string;
537538
}
538-
$search[] = ':' . $key;
539-
$replace[] = $string;
539+
$out = str_replace($search, $replace, $out);
540+
540541
}
541-
$out = str_replace($search, $replace, $out);
542542

543543
if (strpos($this->template, '*')) {
544544
$out = str_replace('*', $params['pass'], $out);

0 commit comments

Comments
 (0)