Permalink
Browse files

Removing unreachable code. Fixes #614

  • Loading branch information...
1 parent a29866b commit 353c600cd76339146f64590c1bbcc8d92d596974 @markstory markstory committed May 14, 2010
Showing with 0 additions and 8 deletions.
  1. +0 −8 cake/libs/view/helpers/paginator.php
@@ -194,18 +194,10 @@ function sortKey($model = null, $options = array()) {
}
if (isset($options['sort']) && !empty($options['sort'])) {
- if (preg_match('/(?:\w+\.)?(\w+)/', $options['sort'], $result) && isset($result[1])) {
- if ($result[0] == $this->defaultModel()) {
- return $result[1];
- }
- }
return $options['sort'];
} elseif (isset($options['order']) && is_array($options['order'])) {
return key($options['order']);
} elseif (isset($options['order']) && is_string($options['order'])) {
- if (preg_match('/(?:\w+\.)?(\w+)/', $options['order'], $result) && isset($result[1])) {
- return $result[1];
- }
return $options['order'];
}
return null;

0 comments on commit 353c600

Please sign in to comment.