Merge pull request #10681 from piwik/updatefix_3

Fix update script screwing up scheduled report data (3.x)

core/Date.php

@@ -258,7 +258,7 @@ class Date
     }
 
     /**
-     * Converts a timestamp in a from UTC to a timezone.
+     * Converts a timestamp from UTC to a timezone.
      *
      * @param int $timestamp The UNIX timestamp to adjust.
      * @param string $timezone The timezone to adjust to.
@@ -266,6 +266,10 @@ class Date
      */
     public static function adjustForTimezone($timestamp, $timezone)
     {
+        if (empty($timezone)) {
+            return $timestamp;
+        }
+
         // manually adjust for UTC timezones
         $utcOffset = self::extractUtcOffset($timezone);
         if ($utcOffset !== false) {

core/Updates/2.16.3-b3.php → core/Updates/2.16.5.php

@@ -16,19 +16,19 @@ use Piwik\Updater;
 use Piwik\Updates as PiwikUpdates;
 
 /**
- * Update for version 2.16.3-b3.
+ * Update for version 2.16.5.
  *
  * Update existing scheduled reports to use UTC timezone for hour setting
  */
-class Updates_2_16_3_b3 extends PiwikUpdates
+class Updates_2_16_5 extends PiwikUpdates
 {
     public function doUpdate(Updater $updater)
     {
         $model      = new ScheduledReportsModel();
         $allReports = ScheduledReportsAPI::getInstance()->getReports();
         foreach ($allReports as $report) {
-            $report['hour'] = $this->adjustTimezoneBySite($report['hour'], $report['idsite']);
-            $model->updateReport($report['idreport'], $report);
+            $update = array('hour' => $this->adjustTimezoneBySite($report['hour'], $report['idsite']));
+            $model->updateReport($report['idreport'], $update);
         }
     }