diff options
| author | Matthieu Aubry <mattab@users.noreply.github.com> | 2016-12-06 15:19:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-06 15:19:48 +0300 |
| commit | b1c09fa5123155ab9cd79342a4a0cef42e80de7f (patch) | |
| tree | 06541e0c5bd079a8904fb3d2f82bfaf9155bda46 /core | |
| parent | 46eafa8ab66d9d7bc785dc6697b8c3168c9d4145 (diff) | |
| parent | d96661e2bd8e54c1ef022cc88e95d133d3f6c615 (diff) | |
Merge pull request #10974 from piwik/3.x-dev3.0.0-rc1
Release Piwik 3.0.0-rc1
Diffstat (limited to 'core')
| -rw-r--r-- | core/Translation/Translator.php | 2 | ||||
| -rw-r--r-- | core/Version.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/Translation/Translator.php b/core/Translation/Translator.php index af2ae597f2..98b3759f3b 100644 --- a/core/Translation/Translator.php +++ b/core/Translation/Translator.php @@ -84,7 +84,7 @@ class Translator } if (count($args) == 0) { - return $translationId; + return str_replace('%%', '%', $translationId); } return vsprintf($translationId, $args); } diff --git a/core/Version.php b/core/Version.php index d7a1318045..ab4135b6b7 100644 --- a/core/Version.php +++ b/core/Version.php @@ -20,7 +20,7 @@ final class Version * The current Piwik version. * @var string */ - const VERSION = '3.0.0-b5'; + const VERSION = '3.0.0-rc1'; public function isStableVersion($version) { |