diff options
author | sgiehl <stefan@piwik.org> | 2014-11-15 23:09:57 +0300 |
---|---|---|
committer | sgiehl <stefan@piwik.org> | 2014-11-15 23:09:57 +0300 |
commit | dff3519bc9152076062b1cd046594103756a5d42 (patch) | |
tree | 2cb1f8397b5311a26ecfa2261d2cce8a2174464a /core/Updates | |
parent | a45c6b956f1828a1a9a209a7bd72a6816e907de7 (diff) | |
parent | d78c73e305aa1bd8c2f0e01a0b9f17292f6b0c88 (diff) |
Merge branch 'master' into deprecate_usersettings
Diffstat (limited to 'core/Updates')
-rw-r--r-- | core/Updates/1.8.3-b1.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/Updates/1.8.3-b1.php b/core/Updates/1.8.3-b1.php index 7a00ec20b3..ee8e6c4d00 100644 --- a/core/Updates/1.8.3-b1.php +++ b/core/Updates/1.8.3-b1.php @@ -98,8 +98,8 @@ class Updates_1_8_3_b1 extends Updates is_null($period) ? ScheduledReports::DEFAULT_PERIOD : $period, ScheduledReports::EMAIL_TYPE, is_null($format) ? ScheduledReports::DEFAULT_REPORT_FORMAT : $format, - Common::json_encode(preg_split('/,/', $reports)), - Common::json_encode($parameters), + json_encode(preg_split('/,/', $reports)), + json_encode($parameters), $ts_created, $ts_last_sent, $deleted |