Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorMatthieu Aubry <mattab@users.noreply.github.com>2016-12-16 07:01:58 +0300
committerGitHub <noreply@github.com>2016-12-16 07:01:58 +0300
commitaf368cfc02bae5026429b0418d83de2b0890ef44 (patch)
tree3f835f1b494253f25b24db668e828bedd0d0017a /core
parentd5377a5149e58457a5d064bece11d7d7aaef4b7a (diff)
parenta8240ff4f99aec2d4419bee1e86788b75fc6437b (diff)
Merge pull request #11026 from piwik/3.x-dev3.0.0-rc4
Piwik 3.0.0-rc4 release
Diffstat (limited to 'core')
-rw-r--r--core/Settings/Setting.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/Settings/Setting.php b/core/Settings/Setting.php
index efd99c3802..c1a3b28c2a 100644
--- a/core/Settings/Setting.php
+++ b/core/Settings/Setting.php
@@ -226,7 +226,7 @@ class Setting
$value = call_user_func($config->transform, $value, $this);
}
- if (isset($this->type)) {
+ if (isset($this->type) && !is_null($value)) {
settype($value, $this->type);
}