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
diff options
context:
space:
mode:
Diffstat (limited to 'core/DataTable/Filter/ColumnCallbackAddMetadata.php')
-rw-r--r--core/DataTable/Filter/ColumnCallbackAddMetadata.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/core/DataTable/Filter/ColumnCallbackAddMetadata.php b/core/DataTable/Filter/ColumnCallbackAddMetadata.php
index bef01a9945..d90079e3f1 100644
--- a/core/DataTable/Filter/ColumnCallbackAddMetadata.php
+++ b/core/DataTable/Filter/ColumnCallbackAddMetadata.php
@@ -27,7 +27,7 @@ class Piwik_DataTable_Filter_ColumnCallbackAddMetadata extends Piwik_DataTable_F
private $functionParameters;
private $metadataToAdd;
- public function __construct( $table, $columnToRead, $metadataToAdd, $functionToApply, $functionParameters = null )
+ public function __construct( $table, $columnToRead, $metadataToAdd, $functionToApply = null, $functionParameters = null )
{
parent::__construct($table);
$this->functionToApply = $functionToApply;
@@ -47,7 +47,14 @@ class Piwik_DataTable_Filter_ColumnCallbackAddMetadata extends Piwik_DataTable_F
{
$parameters = array_merge($parameters, $this->functionParameters);
}
- $newValue = call_user_func_array( $this->functionToApply, $parameters);
+ if(!is_null($this->functionToApply))
+ {
+ $newValue = call_user_func_array( $this->functionToApply, $parameters);
+ }
+ else
+ {
+ $newValue = $oldValue;
+ }
$row->addMetadata($this->metadataToAdd, $newValue);
}
}