aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/type
diff options
context:
space:
mode:
authorPim van den Berg2014-08-10 14:53:39 +0200
committerPim van den Berg2014-08-10 14:53:39 +0200
commite6f0b8cacea083abf8d8aa31f1ce4779dd1508b5 (patch)
treee2cc5641fc984b6d875d85c1dbc2c44459807bff /type
parentMerge remote-tracking branch 'lekensteyn/custom-urls' (diff)
downloadapt-panopticon_cgp-e6f0b8cacea083abf8d8aa31f1ce4779dd1508b5.zip
apt-panopticon_cgp-e6f0b8cacea083abf8d8aa31f1ce4779dd1508b5.tar.gz
apt-panopticon_cgp-e6f0b8cacea083abf8d8aa31f1ce4779dd1508b5.tar.bz2
apt-panopticon_cgp-e6f0b8cacea083abf8d8aa31f1ce4779dd1508b5.tar.xz
type/base: fix undefined variable rrd_url when graph_type != canvas
Diffstat (limited to 'type')
-rw-r--r--type/Base.class.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/type/Base.class.php b/type/Base.class.php
index c47aba2..3bda273 100644
--- a/type/Base.class.php
+++ b/type/Base.class.php
@@ -149,11 +149,13 @@ class Type_Base {
149 function parse_filename($file) { 149 function parse_filename($file) {
150 if ($this->graph_type == 'canvas') { 150 if ($this->graph_type == 'canvas') {
151 $file = str_replace($this->datadir . '/', '', $file); 151 $file = str_replace($this->datadir . '/', '', $file);
152 $rrd_url = str_replace('{file}', $file, $this->rrd_url); 152 $file = str_replace(
153 $rrd_url = str_replace('{file_escaped}', 153 array('{file}', '{file_escaped}'),
154 urlencode($file), $rrd_url); 154 array($file, urlencode($file)),
155 $this->rrd_url
156 );
155 } 157 }
156 return $this->rrd_escape($rrd_url); 158 return $this->rrd_escape($file);
157 } 159 }
158 160
159 function rrd_files() { 161 function rrd_files() {