From 42be0d72ddf823b337da01a085272fa5941c1889 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Fri, 24 Dec 2010 11:59:35 -0500 Subject: [PATCH] ws, cs caught by CI --- framework/Core/lib/Horde/Core/ActiveSync/Connector.php | 2 +- framework/Core/lib/Horde/Core/Factory/Db.php | 2 +- framework/Core/lib/Horde/Themes/Css.php | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/framework/Core/lib/Horde/Core/ActiveSync/Connector.php b/framework/Core/lib/Horde/Core/ActiveSync/Connector.php index c91fe2e90..74642000e 100644 --- a/framework/Core/lib/Horde/Core/ActiveSync/Connector.php +++ b/framework/Core/lib/Horde/Core/ActiveSync/Connector.php @@ -85,7 +85,7 @@ class Horde_Core_ActiveSync_Connector */ public function calendar_getChanges($from_ts, $to_ts) { - try { + try { return $this->_registry->calendar->getChanges($from_ts, $to_ts); } catch (Exception $e) { return array('add' => array(), diff --git a/framework/Core/lib/Horde/Core/Factory/Db.php b/framework/Core/lib/Horde/Core/Factory/Db.php index 6bf1f8d73..251c7d447 100644 --- a/framework/Core/lib/Horde/Core/Factory/Db.php +++ b/framework/Core/lib/Horde/Core/Factory/Db.php @@ -157,7 +157,7 @@ class Horde_Core_Factory_Db $config['host'] = $config['hostspec']; } - $adapter = str_replace(' ', '_' , ucwords(str_replace('_', ' ', basename($config['adapter'])))); + $adapter = str_replace(' ', '_', ucwords(str_replace('_', ' ', basename($config['adapter'])))); $class = 'Horde_Db_Adapter_' . $adapter; if (class_exists($class)) { diff --git a/framework/Core/lib/Horde/Themes/Css.php b/framework/Core/lib/Horde/Themes/Css.php index 6f7caf012..86759360c 100644 --- a/framework/Core/lib/Horde/Themes/Css.php +++ b/framework/Core/lib/Horde/Themes/Css.php @@ -127,7 +127,8 @@ class Horde_Themes_Css if ($conf['cachecssparams']['compress'] == 'php') { try { $out = $injector->getInstance('Horde_Core_Factory_TextFilter')->filter($out, 'csstidy'); - } catch (Horde_Exception $e) {} + } catch (Horde_Exception $e) { + } } switch ($cache_type) { @@ -216,12 +217,14 @@ class Horde_Themes_Css /* Add user-defined additional stylesheets. */ try { $add_css = array_merge($add_css, Horde::callHook('cssfiles', array($theme), 'horde')); - } catch (Horde_Exception_HookNotSet $e) {} + } catch (Horde_Exception_HookNotSet $e) { + } if ($curr_app != 'horde') { try { $add_css = array_merge($add_css, Horde::callHook('cssfiles', array($theme), $curr_app)); - } catch (Horde_Exception_HookNotSet $e) {} + } catch (Horde_Exception_HookNotSet $e) { + } } foreach ($add_css as $f => $u) { @@ -261,7 +264,6 @@ class Horde_Themes_Css } break; - case 'opera': $css_list[] = 'opera.css'; break; -- 2.11.0