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/libs
diff options
context:
space:
mode:
authorLukas Winkler <Findus23@users.noreply.github.com>2017-09-24 22:09:38 +0300
committerStefan Giehl <stefan@piwik.org>2017-09-24 22:09:38 +0300
commit64167befde25e107f8b6e496883d791dd18bd5f5 (patch)
treebf8c3e8f8d77128e0c30780b82467b5166c6da17 /libs
parent3e296e6e3f376e680f3bcef844c7af6415dcb834 (diff)
Make old Sparkline Library support PHP 7.2 (#12099)
* make old sparklines library work with PHP 7.2 * fix typo in old sparkline library
Diffstat (limited to 'libs')
-rw-r--r--libs/sparkline/lib/Sparkline.php6
-rw-r--r--libs/sparkline/lib/SparklineObject.php (renamed from libs/sparkline/lib/Object.php)2
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/sparkline/lib/Sparkline.php b/libs/sparkline/lib/Sparkline.php
index 54ff01a7a0..3e817599bb 100644
--- a/libs/sparkline/lib/Sparkline.php
+++ b/libs/sparkline/lib/Sparkline.php
@@ -22,9 +22,9 @@ define('FONT_3', 3);
define('FONT_4', 4);
define('FONT_5', 5);
-require_once dirname(__FILE__).'/Object.php';
+require_once dirname(__FILE__).'/SparklineObject.php';
-class Sparkline extends Object {
+class Sparkline extends SparklineObject {
var $imageX;
var $imageY;
@@ -405,7 +405,7 @@ class Sparkline extends Object {
}
function DrawImageCopyResampled($dhandle, $shandle, $dx, $dy, $sx, $sy, $dw, $dh, $sw, $sh) {
- $this->Debug("Sparkline :: DrawImageCopyResampled($dhhandle, $shandle, $dx, $dy, $sx, $sy, $dw, $dh, $sw, $sh)", DEBUG_DRAW);
+ $this->Debug("Sparkline :: DrawImageCopyResampled($dhandle, $shandle, $dx, $dy, $sx, $sy, $dw, $dh, $sw, $sh)", DEBUG_DRAW);
if (!$this->IsError()) {
return imagecopyresampled($dhandle, // dest handle
$shandle, // src handle
diff --git a/libs/sparkline/lib/Object.php b/libs/sparkline/lib/SparklineObject.php
index 3a66156691..98a8f4358a 100644
--- a/libs/sparkline/lib/Object.php
+++ b/libs/sparkline/lib/SparklineObject.php
@@ -69,7 +69,7 @@ function log_write($string, $type = '', $date = false) {
}
} // function log_write
-class Object {
+class SparklineObject {
var $isError;
var $logFile;