diff options
-rw-r--r-- | core/Updates/1.12-b16.php | 2 | ||||
-rw-r--r-- | core/Version.php | 2 | ||||
-rw-r--r-- | lang/en.php | 2 | ||||
-rw-r--r-- | plugins/API/API.php | 1 | ||||
-rw-r--r-- | plugins/SegmentEditor/API.php | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/core/Updates/1.12-b16.php b/core/Updates/1.12-b16.php index 8ac3df70da..6938cf45be 100644 --- a/core/Updates/1.12-b16.php +++ b/core/Updates/1.12-b16.php @@ -19,7 +19,7 @@ class Piwik_Updates_1_12_b16 extends Piwik_Updates 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 index 4a0f1de49d..87bda74c95 100644 --- 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 index 3fd3e38b80..a43b45f892 100644 --- a/lang/en.php +++ b/lang/en.php @@ -2009,7 +2009,7 @@ And thank you for using Piwik!', '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 index 9367442952..557cbaf3eb 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -733,6 +733,7 @@ class Piwik_API_API '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 index 15915e1e72..f94683db24 100644 --- a/plugins/SegmentEditor/API.php +++ b/plugins/SegmentEditor/API.php @@ -213,7 +213,7 @@ class Piwik_SegmentEditor_API } if ($segment['deleted']) { - throw new Exception("This segment is marked as deleted."); + throw new Exception("This segment is marked as deleted. "); } return $segment; } |