diff options
author | Thomas ZILLIOX <thomas@zilliox.me> | 2013-07-02 20:08:38 +0400 |
---|---|---|
committer | Thomas ZILLIOX <thomas@zilliox.me> | 2013-07-02 20:08:38 +0400 |
commit | 287dcbbe9eecd9d6e4c5cd89a5a2fa7fe14bb09a (patch) | |
tree | 3ca1c8b4a1fd14cca3c5f492cf6ea8391f1a1060 /plugins/DBStats | |
parent | 3b367dd3afffa6d44fdf0069f62b00c2bb487a5a (diff) |
Merge with master
Diffstat (limited to 'plugins/DBStats')
-rw-r--r-- | plugins/DBStats/API.php | 4 | ||||
-rwxr-xr-x | plugins/DBStats/MySQLMetadataProvider.php | 1 | ||||
-rwxr-xr-x | plugins/DBStats/templates/index.twig | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/plugins/DBStats/API.php b/plugins/DBStats/API.php index fec0e0fe71..693c7f2e1e 100644 --- a/plugins/DBStats/API.php +++ b/plugins/DBStats/API.php @@ -128,9 +128,7 @@ class Piwik_DBStats_API $rowToAddTo['row_count'] += $status['Rows']; } - $result = new Piwik_DataTable(); - $result->addRowsFromArrayWithIndexLabel($rows); - return $result; + return Piwik_DataTable::makeFromIndexedArray($rows); } /** diff --git a/plugins/DBStats/MySQLMetadataProvider.php b/plugins/DBStats/MySQLMetadataProvider.php index 6240a24b19..be487346cb 100755 --- a/plugins/DBStats/MySQLMetadataProvider.php +++ b/plugins/DBStats/MySQLMetadataProvider.php @@ -243,7 +243,6 @@ class Piwik_DBStats_MySQLMetadataProvider array($cols, 'estimated_size', $getEstimatedSize, array($status))); $dataTable->addDataTable($table); - destroy($table); } return $dataTable; } diff --git a/plugins/DBStats/templates/index.twig b/plugins/DBStats/templates/index.twig index 70f4706695..8e6e2a07fe 100755 --- a/plugins/DBStats/templates/index.twig +++ b/plugins/DBStats/templates/index.twig @@ -28,8 +28,8 @@ <p> {{ 'PrivacyManager_DeleteDataDescription'|translate }} <br/> - <a href='{{ url({'module':"PrivacyManager",'action':"privacySettings"}) }}#deleteLogsAnchor'> - {{ 'PrivacyManager_ClickHereSettings'|translate("'"+clickDeleteLogSettings+"'") }} + <a href='{{ linkTo({'module':"PrivacyManager",'action':"privacySettings"}) }}#deleteLogsAnchor'> + {{ 'PrivacyManager_ClickHereSettings'|translate("'"~clickDeleteLogSettings~"'") }} </a> </p> </td> |