Refs #3934 Thanks Peter for testing and finding this. the array_map('…

…urlencode', fixes it
matomo-org · May 23, 2013 · 2476911 · 2476911
1 parent c2f90ff
commit 2476911
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/core/Updates/1.12-b16.php b/core/Updates/1.12-b16.php
@@ -19,7 +19,7 @@ static function getSql($schema = 'Myisam')
         return array(
             // ignore existing column name error (1060)
             'ALTER TABLE ' . Piwik_Common::prefixTable('report')
-                . " ADD COLUMN idsegment INT(11) AFTER description" => 1060,
+                . " ADD COLUMN idsegment INT(11) AFTER description" => false,
         );
     }
 

diff --git a/core/Version.php b/core/Version.php
@@ -20,5 +20,5 @@ final class Piwik_Version
      * Current Piwik version
      * @var string
      */
-    const VERSION = '1.12-b15';
+    const VERSION = '1.12-b16';
 }
diff --git a/lang/en.php b/lang/en.php
@@ -2009,7 +2009,7 @@
     'PDFReports_CreateAndScheduleReport'                                => 'Create and Schedule a report',
     'PDFReports_CancelAndReturnToReports'                               => 'Cancel and %sreturn to the list of reports%s',
     'PDFReports_DescriptionOnFirstPage'                                 => 'The report description will be displayed on the first page of the report.',
-    'PDFReports_Segment_Help'                                           => 'You can select an existing custom segment to apply to data in this email report. You may create and edit custom segments in your dashboard %s(click here to open)%s, then clicking on the "%s" box, then "%s".',
+    'PDFReports_Segment_Help'                                           => 'You can select an existing custom segment to apply to data in this email report. You may create and edit custom segments in your dashboard %s(click here to open)%s, then click on the "%s" box, then "%s".',
     'PDFReports_Segment_Deletion_Error'                                 => 'This segment cannot be deleted, because it is used to generate the email report(s) %s. To delete this segment, you can first edit these reports so they don\'t use this segment.',
     'PDFReports_WeeklyScheduleHelp'                                     => 'Weekly schedule: report will be sent on Monday of each week.',
     'PDFReports_MonthlyScheduleHelp'                                    => 'Monthly schedule: report will be sent the first day of each month.',

diff --git a/plugins/API/API.php b/plugins/API/API.php
@@ -733,6 +733,7 @@ public function getProcessedReport($idSite, $period, $date, $apiModule, $apiActi
                                                        'idSubtable' => $idSubtable,
                                                   ));
         if (!empty($segment)) $parameters['segment'] = $segment;
+        $parameters = array_map('urlencode', $parameters);
 
         $url = Piwik_Url::getQueryStringFromParameters($parameters);
         $request = new Piwik_API_Request($url);

diff --git a/plugins/SegmentEditor/API.php b/plugins/SegmentEditor/API.php
@@ -213,7 +213,7 @@ public function get($idSegment)
         }
 
         if ($segment['deleted']) {
-            throw new Exception("This segment is marked as deleted.");
+            throw new Exception("This segment is marked as deleted. ");
         }
         return $segment;
     }