diff options
| author | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2010-08-27 10:43:01 +0400 |
|---|---|---|
| committer | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2010-08-27 10:43:01 +0400 |
| commit | eb99d13358c6cdc05f816f8eff7a511a42272f0b (patch) | |
| tree | 8f0996ada21c9816cfaa90fc5ab007f0821f308d | |
| parent | 3f41e59e89cad1724faf6a5d9132e2b086d83901 (diff) | |
| parent | 3da383a1dfe1e8fbea87552c6ca494e386532481 (diff) | |
| -rw-r--r-- | core/Updates/0.9.1.php | 12 | ||||
| -rw-r--r-- | libs/jquery/superfish_modified.js | 14 |
2 files changed, 16 insertions, 10 deletions
diff --git a/core/Updates/0.9.1.php b/core/Updates/0.9.1.php index 48d2b6a117..d82ad97c86 100644 --- a/core/Updates/0.9.1.php +++ b/core/Updates/0.9.1.php @@ -32,15 +32,21 @@ class Piwik_Updates_0_9_1 extends Piwik_Updates return array( 'UPDATE '. Piwik_Common::prefixTable('site') .' - SET timezone = "UTC" WHERE timezone IN ('. $timezoneList .')' => false, + SET timezone = "UTC" + WHERE timezone IN ('. $timezoneList .')' => false, 'UPDATE `'. Piwik_Common::prefixTable('option') .'` - SET option_value = "UTC" WHERE option_name = "SitesManager_DefaultTimezone" AND option_value IN ('. $timezoneList .')' => false, + SET option_value = "UTC" + WHERE option_name = "SitesManager_DefaultTimezone" + AND option_value IN ('. $timezoneList .')' => false, ); } static function update() { - Piwik_Updater::updateDatabase(__FILE__, self::getSql()); + if(Piwik::isTimezoneSupportEnabled()) + { + Piwik_Updater::updateDatabase(__FILE__, self::getSql()); + } } } diff --git a/libs/jquery/superfish_modified.js b/libs/jquery/superfish_modified.js index b2671b60df..f4a2a3e9fe 100644 --- a/libs/jquery/superfish_modified.js +++ b/libs/jquery/superfish_modified.js @@ -125,7 +125,6 @@ var o = sf.op, not = (o.retainPath===true) ? o.$path : ''; o.retainPath = false; -// var $ul = $(['li.',o.hoverClass].join(''),this).add(this).not(not).removeClass(o.hoverClass) var $ul = $(['li.',o.hoverClass].join(''),this).add(this).not(not) // piwik .find('>ul').hide().css('visibility','hidden'); o.onHide.call($ul); @@ -133,12 +132,13 @@ }, showSuperfishUl : function(){ var o = sf.op, - sh = sf.c.shadowClass+'-off', - $ul = this.addClass(o.hoverClass).find('>ul:hidden'); - if($ul){ - $ul.css('visibility','visible'); - } - + sh = sf.c.shadowClass+'-off', + $ul = this.addClass(o.hoverClass); + if($ul){ + $ul = $ul.find('>ul:hidden'); + if($ul) $ul.css('visibility','visible'); + } + sf.IE7fix.call($ul); o.onBeforeShow.call($ul); $ul.animate(o.animation,o.speed,function(){ sf.IE7fix.call($ul); o.onShow.call($ul); }); |