Fixes #6309 Remove "Website" from the Email subject and form the repo…

…rt title.
matomo-org · Oct 7, 2014 · afc07ad · afc07ad
1 parent 41683f9
commit afc07ad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/core/ReportRenderer/Html.php b/core/ReportRenderer/Html.php
@@ -189,10 +189,9 @@ protected function getAttachment($report, $processedReport, $prettyDate)
 
         $additionalFile['filename'] =
             sprintf(
-                '%s - %s - %s %d - %s %d%s.png',
+                '%s - %s - %d - %s %d%s.png',
                 $processedReportMetadata['name'],
                 $prettyDate,
-                Piwik::translate('General_Website'),
                 $report['idsite'],
                 Piwik::translate('General_Report'),
                 $report['idreport'],

diff --git a/plugins/ScheduledReports/API.php b/plugins/ScheduledReports/API.php
@@ -560,7 +560,7 @@ private function getModel()
     private static function getReportSubjectAndReportTitle($websiteName, $reports)
     {
         // if the only report is "All websites", we don't display the site name
-        $reportTitle = Piwik::translate('General_Website') . " " . $websiteName;
+        $reportTitle = $websiteName;
         $reportSubject = $websiteName;
         if (count($reports) == 1
             && $reports[0] == 'MultiSites_getAll'

diff --git a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
@@ -24,6 +24,7 @@
  * Class Plugins_ScheduledReportsTest
  *
  * @group Plugins
+ * @group ScheduledReportsTest
  */
 class Plugins_ScheduledReportsTest extends DatabaseTestCase
 {
@@ -399,8 +400,8 @@ public function testGetScheduledTasks()
     public function getGetReportSubjectAndReportTitleTestCases()
     {
         return array(
-            array('Piwik.org', 'General_Website Piwik.org', 'Piwik.org', array('UserSettings_getBrowserType')),
-            array('Piwik.org', 'General_Website Piwik.org', 'Piwik.org', array('MultiSites_getAll', 'UserSettings_getBrowserType')),
+            array('<Piwik.org>', '<Piwik.org>', '<Piwik.org>', array('UserSettings_getBrowserType')),
+            array('Piwik.org', 'Piwik.org', 'Piwik.org', array('MultiSites_getAll', 'UserSettings_getBrowserType')),
             array('General_MultiSitesSummary', 'General_MultiSitesSummary', 'Piwik.org', array('MultiSites_getAll')),
         );
     }