From f55b55a2e47fced46ca6fb2d34720cfec9301e9d Mon Sep 17 00:00:00 2001 From: Chuck Hagenbuch Date: Sat, 24 Jan 2009 15:17:50 -0500 Subject: [PATCH] minor CS tweaks --- framework/Routes/lib/Horde/Routes/Mapper.php | 5 ++--- framework/Routes/lib/Horde/Routes/Route.php | 2 +- framework/Routes/lib/Horde/Routes/Utils.php | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/framework/Routes/lib/Horde/Routes/Mapper.php b/framework/Routes/lib/Horde/Routes/Mapper.php index 742e433dc..10dbfd5c7 100644 --- a/framework/Routes/lib/Horde/Routes/Mapper.php +++ b/framework/Routes/lib/Horde/Routes/Mapper.php @@ -430,8 +430,7 @@ class Horde_Routes_Mapper if (empty($url)) { $url = '/'; } - } - else { + } else { return array(null, null, $matchLog); } } @@ -771,7 +770,7 @@ class Horde_Routes_Mapper * # '/regions/51/locations' * * Note: Since Horde Routes 0.2.0 and Python Routes 1.8, this method is - * not compatible with earlier versions inasmuch as the semicolon is no + * not compatible with earlier versions inasmuch as the semicolon is no * longer used to delimit custom actions. This was a change in Rails * itself (http://dev.rubyonrails.org/changeset/6485) and adopting it * here allows us to keep parity with Rails and ActiveResource. diff --git a/framework/Routes/lib/Horde/Routes/Route.php b/framework/Routes/lib/Horde/Routes/Route.php index fb7c29844..4b5437887 100644 --- a/framework/Routes/lib/Horde/Routes/Route.php +++ b/framework/Routes/lib/Horde/Routes/Route.php @@ -815,7 +815,7 @@ class Horde_Routes_Route $newExtras = array(); foreach ($kargs as $key => $value) { if (in_array($key, $extras) && ($key != 'action' || $key != 'controller')) { - $newExtras[$key] = $value; + $newExtras[$key] = $value; } } $url .= http_build_query($newExtras); diff --git a/framework/Routes/lib/Horde/Routes/Utils.php b/framework/Routes/lib/Horde/Routes/Utils.php index eb13ec298..adbec274c 100644 --- a/framework/Routes/lib/Horde/Routes/Utils.php +++ b/framework/Routes/lib/Horde/Routes/Utils.php @@ -270,8 +270,8 @@ class Horde_Routes_Utils new RecursiveDirectoryIterator($dirname)) as $entry) { if ($entry->isFile()) { - // match .php files that don't start with an underscore - if (preg_match('/^[^_]{1,1}.*\.php$/', basename($entry->getFilename())) != 0) { + // match .php files that don't start with an underscore + if (preg_match('/^[^_]{1,1}.*\.php$/', basename($entry->getFilename())) != 0) { // strip off base path: dirname/admin/users.php -> admin/users.php $controller = preg_replace("/^$baseregexp(.*)\.php/", '\\1', $entry->getPathname()); -- 2.11.0