diff options
author | Fabian Becker <halfdan@xnorfz.de> | 2013-04-29 16:47:52 +0400 |
---|---|---|
committer | Fabian Becker <halfdan@xnorfz.de> | 2013-04-29 16:47:52 +0400 |
commit | b62473e57e1d236bed0a9d4d13f54cf51f55cdc9 (patch) | |
tree | 09f62f2469305882f742803418605f4c8cb6fa77 /plugins/MobileMessaging | |
parent | 7bcfa61a8f5044500c8f20620a4159f6bc7398f5 (diff) | |
parent | 8af5f6443c82e404b9b7855d5978a299bb13d905 (diff) |
Merge branch 'master' into 2.x-twig
Conflicts:
core/ReportRenderer/Html.php
plugins/Annotations/templates/annotations.js
plugins/CoreHome/templates/header.tpl
plugins/CoreHome/templates/index_content.tpl
plugins/CoreHome/templates/period_select.tpl
plugins/Goals/templates/list_goal_edit.tpl
plugins/MultiSites/templates/index.tpl
plugins/PDFReports/templates/report_parameters.tpl
Diffstat (limited to 'plugins/MobileMessaging')
-rw-r--r-- | plugins/MobileMessaging/MobileMessaging.php | 10 | ||||
-rw-r--r-- | plugins/MobileMessaging/ReportRenderer/Exception.php | 2 | ||||
-rw-r--r-- | plugins/MobileMessaging/ReportRenderer/Sms.php | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/plugins/MobileMessaging/MobileMessaging.php b/plugins/MobileMessaging/MobileMessaging.php index 62028ba3e4..426798f183 100644 --- a/plugins/MobileMessaging/MobileMessaging.php +++ b/plugins/MobileMessaging/MobileMessaging.php @@ -242,14 +242,14 @@ class Piwik_MobileMessaging extends Piwik_Plugin $notificationInfo = $notification->getNotificationInfo(); $report = $notificationInfo[Piwik_PDFReports_API::REPORT_KEY]; $contents = $notificationInfo[Piwik_PDFReports_API::REPORT_CONTENT_KEY]; + $reportSubject = $notificationInfo[Piwik_PDFReports_API::REPORT_SUBJECT_KEY]; $parameters = $report['parameters']; $phoneNumbers = $parameters[self::PHONE_NUMBERS_PARAMETER]; - if (in_array('MultiSites_getAll', $report['reports'])) { - $from = Piwik_Translate('General_Reports'); - } else { - $from = $notificationInfo[Piwik_PDFReports_API::WEBSITE_NAME_KEY]; + // 'All Websites' is one character above the limit, use 'Reports' instead + if ($reportSubject == Piwik_Translate('General_MultiSitesSummary')) { + $reportSubject = Piwik_Translate('General_Reports'); } $mobileMessagingAPI = Piwik_MobileMessaging_API::getInstance(); @@ -257,7 +257,7 @@ class Piwik_MobileMessaging extends Piwik_Plugin $mobileMessagingAPI->sendSMS( $contents, $phoneNumber, - $from + $reportSubject ); } } diff --git a/plugins/MobileMessaging/ReportRenderer/Exception.php b/plugins/MobileMessaging/ReportRenderer/Exception.php index a1eac80d8f..5fa5796895 100644 --- a/plugins/MobileMessaging/ReportRenderer/Exception.php +++ b/plugins/MobileMessaging/ReportRenderer/Exception.php @@ -59,7 +59,7 @@ class Piwik_MobileMessaging_ReportRenderer_Exception extends Piwik_ReportRendere return $this->rendering; } - public function renderFrontPage($websiteName, $prettyDate, $description, $reportMetadata) + public function renderFrontPage($reportTitle, $prettyDate, $description, $reportMetadata) { // nothing to do } diff --git a/plugins/MobileMessaging/ReportRenderer/Sms.php b/plugins/MobileMessaging/ReportRenderer/Sms.php index 96f2999d9f..d492dc1281 100644 --- a/plugins/MobileMessaging/ReportRenderer/Sms.php +++ b/plugins/MobileMessaging/ReportRenderer/Sms.php @@ -47,7 +47,7 @@ class Piwik_MobileMessaging_ReportRenderer_Sms extends Piwik_ReportRenderer return $this->rendering; } - public function renderFrontPage($websiteName, $prettyDate, $description, $reportMetadata) + public function renderFrontPage($reportTitle, $prettyDate, $description, $reportMetadata) { // nothing to do } |